Merge branch 'beta' into prabbydSemiInvulFix

pagefaultgames · Oct 14, 2024 · 7a1c0c1 · 7a1c0c1
2 parents 7911f0f + e962ac1
commit 7a1c0c1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts
@@ -128,7 +128,9 @@ export class MovePhase extends BattlePhase {
 
     this.lapsePreMoveAndMoveTags();
 
-    this.resolveFinalPreMoveCancellationChecks();
+    if (!(this.failed || this.cancelled)) {
+      this.resolveFinalPreMoveCancellationChecks();
+    }
 
     if (this.cancelled || this.failed) {
       this.handlePreMoveFailures();