IAmChrisAMA/pokerogue
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crashes

Browse Source
This commit is contained in:
Flashfyre committed 2023-04-18 15:07:10 -04:00
1 parent 8d8f3d6c92
commit 40058539a7
7 files changed
+91 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/battle-phases.ts
+9 -5
View File
@@ -534,11 +534,15 @@ export class TurnEndPhase extends BattlePhase {
const playerPokemon = this.scene.getPlayerPokemon();
const enemyPokemon = this.scene.getEnemyPokemon();
playerPokemon.lapseTags(BattleTagLapseType.TURN_END);
enemyPokemon.lapseTags(BattleTagLapseType.TURN_END);
if (playerPokemon) {
playerPokemon.lapseTags(BattleTagLapseType.TURN_END);
playerPokemon.battleSummonData.turnCount++;
}
playerPokemon.battleSummonData.turnCount++;
enemyPokemon.battleSummonData.turnCount++;
if (enemyPokemon) {
enemyPokemon.lapseTags(BattleTagLapseType.TURN_END);
enemyPokemon.battleSummonData.turnCount++;
}
this.end();
}
@@ -691,7 +695,7 @@ export abstract class MovePhase extends BattlePhase {
}
end() {
if (!this.followUp)
if (!this.followUp && this.canMove())
this.scene.unshiftPhase(new MoveEndPhase(this.scene, this.pokemon.isPlayer()));
super.end();