From dd904fe7827eb2695c5362f0864e32d58df10c6c Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sun, 17 Nov 2024 18:08:00 -0800
Subject: [PATCH 1/2] [Hotfix] Prevent crash if enemy Future Sight user is
 caught (#4905)

---
 package-lock.json               |  4 ++--
 package.json                    |  2 +-
 src/field/pokemon.ts            |  7 +++++--
 src/phases/move-effect-phase.ts | 10 +++++++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 792720200a9..22a55cdfa28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.2.0",
+			"version": "1.2.1",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",
diff --git a/package.json b/package.json
index 3c65fe1a8b9..5aaffc59de1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"type": "module",
 	"scripts": {
 		"start": "vite",
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 1dc4972af79..217d5fa699b 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -3243,11 +3243,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     return null;
   }
 
-  getMoveHistory(): TurnMove[] {
+  public getMoveHistory(): TurnMove[] {
     return this.battleSummonData.moveHistory;
   }
 
-  pushMoveHistory(turnMove: TurnMove) {
+  public pushMoveHistory(turnMove: TurnMove): void {
+    if (!this.isOnField()) {
+      return;
+    }
     turnMove.turn = this.scene.currentBattle?.turn;
     this.getMoveHistory().push(turnMove);
   }
diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts
index afc8dd0475d..3a609f850c6 100644
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@@ -92,8 +92,12 @@ export class MoveEffectPhase extends PokemonPhase {
 
     const isDelayedAttack = this.move.getMove().hasAttr(DelayedAttackAttr);
     /** If the user was somehow removed from the field and it's not a delayed attack, end this phase */
-    if (!user.isOnField() && !isDelayedAttack) {
-      return super.end();
+    if (!user.isOnField()) {
+      if (!isDelayedAttack) {
+        return super.end();
+      } else {
+        user.resetTurnData();
+      }
     }
 
     /**
@@ -174,7 +178,7 @@ export class MoveEffectPhase extends PokemonPhase {
 
       const playOnEmptyField = this.scene.currentBattle?.mysteryEncounter?.hasBattleAnimationsWithoutTargets ?? false;
       // Move animation only needs one target
-      new MoveAnim(move.id as Moves, user, this.getFirstTarget()!.getBattlerIndex()!, playOnEmptyField).play(this.scene, move.hitsSubstitute(user, this.getFirstTarget()!), () => {
+      new MoveAnim(move.id as Moves, user, this.getFirstTarget()!.getBattlerIndex(), playOnEmptyField).play(this.scene, move.hitsSubstitute(user, this.getFirstTarget()!), () => {
         /** Has the move successfully hit a target (for damage) yet? */
         let hasHit: boolean = false;
         for (const target of targets) {

From 0c920ba195c8fa8470694f5a1f4b3157438aa256 Mon Sep 17 00:00:00 2001
From: Moka <54149968+MokaStitcher@users.noreply.github.com>
Date: Mon, 18 Nov 2024 19:41:24 +0100
Subject: [PATCH 2/2] [Hotfix] Prevent more Future Sight crash with new catches
 (#4910)

---
 package-lock.json               | 4 ++--
 package.json                    | 2 +-
 src/phases/move-effect-phase.ts | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 22a55cdfa28..9d6e2440f44 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.2.1",
+	"version": "1.2.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.2.1",
+			"version": "1.2.2",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",
diff --git a/package.json b/package.json
index 5aaffc59de1..ef2d4938087 100644
--- 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
index 3a609f850c6..f7a9b22c396 100644
--- 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();
       }
     }