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

Cancel Only during Windup

Browse Source
This commit is contained in:
Kam committed 2026-03-01 15:49:04 -05:00
1 parent 6eeeddad3f
commit edb9686703
2 files changed
+4 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/AbstractDataAbilities.java
+2 -5
View File
@@ -1113,11 +1113,8 @@ public abstract class AbstractDataAbilities {
if (hasExecutingAbility) {
AbilityPhase phase = currentAbility.getPhase();
// Cannot cancel during DAZED (already interrupted)
if (phase == AbilityPhase.DAZED) return;
// Only allow cancel during active phases
if (phase != AbilityPhase.WINDUP && phase != AbilityPhase.ACTIVE
&& phase != AbilityPhase.BURST_DELAY) return;
// Only allow cancel during WINDUP phase
if (phase != AbilityPhase.WINDUP) return;
// Remove telegraph
removeTelegraph(currentAbility);
src/main/java/noppes/npcs/controllers/data/PlayerAbilityData.java
+2 -4
View File
@@ -610,12 +610,10 @@ public class PlayerAbilityData extends AbstractDataAbilities implements IPlayerA
if (!hasExecutingAbility && !isInChainDelay) return false;
// Don't allow cancel during DAZED
// Only allow cancel during WINDUP phase
if (hasExecutingAbility) {
AbilityPhase phase = currentAbility.getPhase();
if (phase == AbilityPhase.DAZED) return false;
if (phase != AbilityPhase.WINDUP && phase != AbilityPhase.ACTIVE
&& phase != AbilityPhase.BURST_DELAY) return false;
if (phase != AbilityPhase.WINDUP) return false;
}
long worldTime = getWorldTime();