From 714ac8d4616e8e6a34e55228fd949c3435f0373c Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 17 Apr 2015 11:20:46 +0100 Subject: [PATCH] Fixed a crash when shift-clicking damanged non-flower items into the Flower Pouch. --- .../vazkii/botania/client/gui/bag/ContainerFlowerBag.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index 2d38fa365..effca93a5 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -71,9 +71,11 @@ public class ContainerFlowerBag extends Container { return null; } else { int i = itemstack.getItemDamage(); - Slot slot1 = (Slot)inventorySlots.get(i); - if(slot1.isItemValid(itemstack) && !mergeItemStack(itemstack1, i, i + 1, true)) - return null; + if(i < 16) { + Slot slot1 = (Slot)inventorySlots.get(i); + if(slot1.isItemValid(itemstack) && !mergeItemStack(itemstack1, i, i + 1, true)) + return null; + } } if(itemstack1.stackSize == 0)