ensure kill aura registers when attacking stops

fixes many minor pausing and swapping related issues in ka

Author: gigglingbed

src/main/java/meteordevelopment/meteorclient/systems/modules/combat/KillAura.java

@@ -262,17 +262,33 @@ public void onDeactivate() {
 
     @EventHandler
     private void onTick(TickEvent.Pre event) {
-        if (!mc.player.isAlive() || PlayerUtils.getGameMode() == GameMode.SPECTATOR) return;
-        if (pauseOnUse.get() && (mc.interactionManager.isBreakingBlock() || mc.player.isUsingItem())) return;
-        if (onlyOnClick.get() && !mc.options.attackKey.isPressed()) return;
-        if (TickRate.INSTANCE.getTimeSinceLastTick() >= 1f && pauseOnLag.get()) return;
-        if (pauseOnCA.get() && Modules.get().get(CrystalAura.class).isActive() && Modules.get().get(CrystalAura.class).kaTimer > 0) return;
-
+        if (!mc.player.isAlive() || PlayerUtils.getGameMode() == GameMode.SPECTATOR) {
+            stopAttacking();
+            return;
+        }
+        if (pauseOnUse.get() && (mc.interactionManager.isBreakingBlock() || mc.player.isUsingItem())) {
+            stopAttacking();
+            return;
+        }
+        if (onlyOnClick.get() && !mc.options.attackKey.isPressed()) {
+            stopAttacking();
+            return;
+        }
+        if (TickRate.INSTANCE.getTimeSinceLastTick() >= 1f && pauseOnLag.get()) {
+            stopAttacking();
+            return;
+        }
+        if (pauseOnCA.get() && Modules.get().get(CrystalAura.class).isActive() && Modules.get().get(CrystalAura.class).kaTimer > 0) {
+            stopAttacking();
+            return;
+        }
         if (onlyOnLook.get()) {
             Entity targeted = mc.targetedEntity;
 
-            if (targeted == null) return;
-            if (!entityCheck(targeted)) return;
+            if (targeted == null || !entityCheck(targeted)) {
+                stopAttacking();
+                return;
+            }
 
             targets.clear();
             targets.add(mc.targetedEntity);
@@ -282,15 +298,7 @@ private void onTick(TickEvent.Pre event) {
         }
 
         if (targets.isEmpty()) {
-            attacking = false;
-            if (wasPathing) {
-                PathManagers.get().resume();
-                wasPathing = false;
-            }
-            if (swapBack.get() && swapped) {
-                InvUtils.swap(previousSlot, false);
-                swapped = false;
-            }
+            stopAttacking();
             return;
         }
 
@@ -319,7 +327,10 @@ private void onTick(TickEvent.Pre event) {
             InvUtils.swap(weaponResult.slot(), false);
         }
 
-        if (!itemInHand()) return;
+        if (!itemInHand()) {
+            stopAttacking();
+            return;
+        }
 
         attacking = true;
         if (rotation.get() == RotationMode.Always) Rotations.rotate(Rotations.getYaw(primary), Rotations.getPitch(primary, Target.Body));
@@ -338,6 +349,20 @@ private void onSendPacket(PacketEvent.Send event) {
         }
     }
 
+    private void stopAttacking() {
+        if (!attacking) return;
+
+        attacking = false;
+        if (wasPathing) {
+            PathManagers.get().resume();
+            wasPathing = false;
+        }
+        if (swapBack.get() && swapped) {
+            InvUtils.swap(previousSlot, false);
+            swapped = false;
+        }
+    }
+
     private boolean shouldShieldBreak() {
         for (Entity target : targets) {
             if (target instanceof PlayerEntity player) {