From 3fdea4c6058473ff4618484768d4d27ead726dd2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 13 Nov 2019 15:38:11 -0600 Subject: [PATCH] Make close check for bag/box more robust --- .../vazkii/botania/client/gui/bag/ContainerFlowerBag.java | 5 +++-- .../vazkii/botania/client/gui/box/ContainerBaubleBox.java | 5 +++-- 2 files changed, 6 insertions(+), 4 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 dcce6377f..4e3af9927 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -66,8 +66,9 @@ public class ContainerFlowerBag extends Container { @Override public boolean canInteractWith(@Nonnull PlayerEntity player) { - return player.getHeldItemMainhand() == bag - || player.getHeldItemOffhand() == bag; + ItemStack main = player.getHeldItemMainhand(); + ItemStack off = player.getHeldItemOffhand(); + return !main.isEmpty() && main == bag || !off.isEmpty() && off == bag; } @Nonnull diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index bac5ed9e6..07e28f18b 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -78,8 +78,9 @@ public class ContainerBaubleBox extends Container { @Override public boolean canInteractWith(@Nonnull PlayerEntity player) { - return player.getHeldItemMainhand() == box - || player.getHeldItemOffhand() == box; + ItemStack main = player.getHeldItemMainhand(); + ItemStack off = player.getHeldItemOffhand(); + return !main.isEmpty() && main == box || !off.isEmpty() && off == box; } @Nonnull