Skip to content

Commit

Permalink
Remove potential desync from PokemonHealPhase (pagefaultgames#4497)
Browse files Browse the repository at this point in the history
  • Loading branch information
innerthunder authored Sep 28, 2024
1 parent 771b0ed commit a69da4b
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/phases/pokemon-heal-phase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ export class PokemonHealPhase extends CommonAnimPhase {
const pokemon = this.getPokemon();

if (!pokemon.isOnField() || (!this.revive && !pokemon.isActive())) {
super.end();
return;
return super.end();
}

const hasMessage = !!this.message;
Expand All @@ -58,7 +57,7 @@ export class PokemonHealPhase extends CommonAnimPhase {
if (healBlock && this.hpHealed > 0) {
this.scene.queueMessage(healBlock.onActivation(pokemon));
this.message = null;
super.end();
return super.end();
} else if (healOrDamage) {
const hpRestoreMultiplier = new Utils.IntegerHolder(1);
if (!this.revive) {
Expand Down

0 comments on commit a69da4b

Please sign in to comment.