upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 20:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Interrupt Logic

Browse Source
This commit is contained in:
Kam committed 2026-02-24 00:21:54 -05:00
1 parent 2f170363de
commit 8aa16c882e
1 file changed
+6 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java
+6 -4
View File
@@ -1154,8 +1154,8 @@ public abstract class Ability implements IAbility, IAbilityAction {
public void interrupt() {
cleanupBurstEntities();
cleanup();
if (interruptible && (phase == AbilityPhase.WINDUP || phase == AbilityPhase.BURST_DELAY)) {
// Interrupted during windup or burst delay - go to dazed state
if (interruptible && phase == AbilityPhase.WINDUP) {
// Interrupted during windup - go to dazed state
phase = AbilityPhase.DAZED;
currentTick = 0;
} else {
@@ -1192,13 +1192,15 @@ public abstract class Ability implements IAbility, IAbilityAction {
/**
* Check if can be interrupted by this damage source.
* Only direct physical hits (not magic, fire, or other indirect damage) can interrupt.
* Interruption only occurs during WINDUP phase - if ability is already active, it completes.
* Interruption only occurs during WINDUP phase (including burst replay windups).
* BURST_DELAY is not interruptible - only the windup animation itself can be interrupted.
* For chained abilities, windUpAll controls whether subsequent entries even have a windup.
*
* @param source The damage source
* @return true if the ability should be interrupted
*/
public boolean canInterrupt(DamageSource source) {
if (!interruptible || (phase != AbilityPhase.WINDUP && phase != AbilityPhase.BURST_DELAY)) {
if (!interruptible || phase != AbilityPhase.WINDUP) {
return false;
}
if (isInvulnerableForCurrentPhase()) {