From d19af289ee482da86e5544f3daf34cbbadf5f143 Mon Sep 17 00:00:00 2001 From: Ecys <73040912+Eccys@users.noreply.github.com> Date: Sat, 24 Oct 2026 06:05:02 +0000 Subject: [PATCH] fix(KillAura): fall back to normal weapons when shield breaking without an axe --- .../systems/modules/combat/KillAura.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/combat/KillAura.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/combat/KillAura.java index aeea4ad28f..b7d87a839d 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/combat/KillAura.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/combat/KillAura.java @@ -336,12 +336,14 @@ private void onTick(TickEvent.Pre event) { if (axeResult.found()) weaponResult = axeResult; } - if (!swapped) { - previousSlot = mc.player.getInventory().getSelectedSlot(); - swapped = true; - } + if (weaponResult.found()) { + if (!swapped) { + previousSlot = mc.player.getInventory().getSelectedSlot(); + swapped = true; + } - InvUtils.swap(weaponResult.slot(), false); + InvUtils.swap(weaponResult.slot(), false); + } } if (!acceptableWeapon(mc.player.getMainHandItem())) { @@ -468,7 +470,7 @@ private void attack(Entity target) { } private boolean acceptableWeapon(ItemStack stack) { - if (shouldShieldBreak()) return stack.is(ItemTags.AXES); + if (shouldShieldBreak() && stack.is(ItemTags.AXES)) return true; if (attackWhenHolding.get() == AttackItems.All) return true; if (weapons.get().contains(Items.DIAMOND_SWORD) && stack.is(ItemTags.SWORDS)) return true;