From 4330405f961283fab1058973f6c22f0a3721dbb7 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 27 Jan 2026 04:12:39 -0500 Subject: [PATCH] Fix Cooldown Logic --- src/api | 2 +- src/main/java/noppes/npcs/DataAbilities.java | 44 ++++++++++++++++---- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/api b/src/api index ae73e1b88..2054012fa 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit ae73e1b885415701c1ee20b64c1d0ae9c9089efc +Subproject commit 2054012fae799fa233b99824b4f649d311eff86f diff --git a/src/main/java/noppes/npcs/DataAbilities.java b/src/main/java/noppes/npcs/DataAbilities.java index 92bb1241c..0ff0aa8a1 100644 --- a/src/main/java/noppes/npcs/DataAbilities.java +++ b/src/main/java/noppes/npcs/DataAbilities.java @@ -166,8 +166,20 @@ public class DataAbilities { // Call onExecute currentAbility.onExecute(npc, target, npc.worldObj); + + // Check if ability completed during onExecute (signalCompletion was called) + if (currentAbility.getPhase() == AbilityPhase.IDLE) { + handleAbilityCompletion(target); + return; + } } currentAbility.onActiveTick(npc, target, npc.worldObj, currentAbility.getCurrentTick()); + + // Check if ability completed during onActiveTick (signalCompletion was called) + if (currentAbility.getPhase() == AbilityPhase.IDLE) { + handleAbilityCompletion(target); + return; + } break; case DAZED: @@ -175,17 +187,31 @@ public class DataAbilities { break; case IDLE: - // Ability completed - currentAbility.onComplete(npc, target); - - // Fire complete event - AbilityEvent.CompleteEvent completeEvent = new AbilityEvent.CompleteEvent( - npc.wrappedNPC, currentAbility, target); - NpcAPI.EVENT_BUS.post(completeEvent); - - onAbilityComplete(); + // Ability completed (reached via tick() phase transition from DAZED) + handleAbilityCompletion(target); break; } + } + + /** + * Handle ability completion - called when ability phase becomes IDLE. + * This can happen from: + * - signalCompletion() called in onExecute() or onActiveTick() + * - tick() transitioning from DAZED to IDLE + */ + private void handleAbilityCompletion(EntityLivingBase target) { + if (currentAbility == null) return; + + // Call onComplete callback + currentAbility.onComplete(npc, target); + + // Fire complete event + AbilityEvent.CompleteEvent completeEvent = new AbilityEvent.CompleteEvent( + npc.wrappedNPC, currentAbility, target); + NpcAPI.EVENT_BUS.post(completeEvent); + + // Clean up and roll cooldown + onAbilityComplete(); // Clear AI pathfinding if ability is controlling movement // But DON'T zero motion - let the ability set it if needed