diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AutoArmor.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AutoArmor.java index 2afa0d315b..d471ebcb71 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AutoArmor.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/combat/AutoArmor.java @@ -281,7 +281,7 @@ public void calculate() { Utils.getEnchantments(itemStack, enchantments); // Return if current armor piece has Curse of Binding - if (enchantments.containsKey(Enchantments.BINDING_CURSE)) { + if (enchantments.keySet().stream().anyMatch(e -> e.is(Enchantments.BINDING_CURSE))) { score = Integer.MAX_VALUE; // Setting score to Integer.MAX_VALUE so its now swapped later return; } @@ -316,7 +316,7 @@ else if (antiBreak.get() && durability <= 10) { private int decreaseScoreByAvoidedEnchantments(int score) { for (ResourceKey enchantment : avoidedEnchantments.get()) { - score -= 2 * enchantments.getInt(enchantment); + score -= 2 * Utils.getEnchantmentLevel(enchantments, enchantment); } return score; diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Blink.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Blink.java index c696c3364a..2e669ffb24 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Blink.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Blink.java @@ -139,7 +139,8 @@ private void onJoinGame(GameJoinedEvent event) { @EventHandler private void onLeaveGame(GameLeftEvent event) { - onDeactivate(); + dumpPackets(false); + cancelled = false; } @Override diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/player/AutoEat.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/player/AutoEat.java index 92b116d650..433505a37a 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/player/AutoEat.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/player/AutoEat.java @@ -179,6 +179,7 @@ private void onItemUseCrosshairTarget(ItemUseCrosshairTargetEvent event) { private void startEating() { prevSlot = mc.player.getInventory().getSelectedSlot(); eat(); + if (!eating) return; // Pause auras wasAura.clear();