From bc0dc833f442bec5c6128d74b1e7ecfe829701bb Mon Sep 17 00:00:00 2001 From: Bixilon Date: Tue, 21 Mar 2023 21:37:59 +0100 Subject: [PATCH] interactions: don't interact with offhand if unavailable (<1.9) --- .../minosoft/input/interaction/use/UseHandler.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/input/interaction/use/UseHandler.kt b/src/main/java/de/bixilon/minosoft/input/interaction/use/UseHandler.kt index f0c00ee06..f4d6c47e6 100644 --- a/src/main/java/de/bixilon/minosoft/input/interaction/use/UseHandler.kt +++ b/src/main/java/de/bixilon/minosoft/input/interaction/use/UseHandler.kt @@ -89,6 +89,10 @@ class UseHandler( // check both hands if we can interact // if we can, stop further interactions for (hand in Hands.VALUES) { + if (hand == Hands.OFF && !connection.version.hasOffhand) { + // only one hand available + return + } val stack = connection.player.items.inventory[hand] if (target != null && short.tryUse(hand, target, stack)) { @@ -115,12 +119,6 @@ class UseHandler( return } sendItemUse(hand, stack) - - - if (!connection.version.hasOffhand) { - // only one hand available - return - } } }