fix Future Sight crash with new catches, attempt 2

pagefaultgames · Nov 18, 2024 · dd5592e · dd5592e
1 parent dd904fe
commit dd5592e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.2.1",
+	"version": "1.2.2",
 	"type": "module",
 	"scripts": {
 		"start": "vite",

diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts
@@ -96,6 +96,14 @@ export class MoveEffectPhase extends PokemonPhase {
       if (!isDelayedAttack) {
         return super.end();
       } else {
+        if (!user.scene) {
+          /**
+           * This happens if the Pokemon that used the delayed attack gets caught and released
+           * on the turn the attack would have triggered. Having access to the global scene
+           * in the future may solve this entirely, so for now we just cancel the hit
+           */
+          return super.end();
+        }
         user.resetTurnData();
       }
     }