From 2b3a365529fd6e6f5f09185b485daad825e475af Mon Sep 17 00:00:00 2001 From: Zach Day Date: Mon, 10 Jun 2024 14:51:03 -0400 Subject: [PATCH] Fix RUN command causing freeze --- src/phases.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/phases.ts b/src/phases.ts index a50cfac439e..d31f3dced90 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -2515,7 +2515,13 @@ export class MovePhase extends BattlePhase { console.log(Moves[this.move.moveId]); + if (!this.pokemon.isActive(true)) { + // Battle has ended, for example when RUN has been selected + return this.end(); + } + if (!this.canMove()) { + // The selected move has been made unusable this.fail(); this.showMoveText(); this.showFailedText();