diff --git a/src/main/java/forestry/core/gui/ContainerItemInventory.java b/src/main/java/forestry/core/gui/ContainerItemInventory.java index 50dc16097..423d8ee36 100755 --- a/src/main/java/forestry/core/gui/ContainerItemInventory.java +++ b/src/main/java/forestry/core/gui/ContainerItemInventory.java @@ -53,4 +53,13 @@ public abstract class ContainerItemInventory extends Co inventory.onSlotClick(player); return result; } + + @Override + public void detectAndSendChanges() { + if (!inventory.isParentItemEquipped()) { + inventory.getPlayer().closeScreen(); + return; + } + super.detectAndSendChanges(); + } } diff --git a/src/main/java/forestry/core/inventory/ItemInventory.java b/src/main/java/forestry/core/inventory/ItemInventory.java index 39adc4ded..272f15da6 100755 --- a/src/main/java/forestry/core/inventory/ItemInventory.java +++ b/src/main/java/forestry/core/inventory/ItemInventory.java @@ -78,6 +78,14 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate { } } + public boolean isParentItemEquipped() { + return isSameItemInventory(player.getCurrentEquippedItem(), parent); + } + + public EntityPlayer getPlayer() { + return player; + } + public boolean isParentItemInventory(ItemStack itemStack) { ItemStack parent = getParent(); return isSameItemInventory(parent, itemStack);