From f5dc9355e6d1a7f547ea3d3d1e8c417b8bf2218d Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Thu, 8 Aug 2024 18:28:00 -0700 Subject: [PATCH] Replace `target instanceof EnemyPokemon` with `target.isPlayer()` --- src/data/move.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index 9d64e818f1a..23e86c59604 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1918,7 +1918,6 @@ export class StatusEffectAttr extends MoveEffectAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const moveChance = this.getMoveChance(user, target, move, this.selfTarget, true); const statusCheck = moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance; - const targetSide = target instanceof EnemyPokemon ? ArenaTagSide.ENEMY : ArenaTagSide.PLAYER; if (statusCheck) { const pokemon = this.selfTarget ? user : target; if (pokemon.status) { @@ -1929,7 +1928,7 @@ export class StatusEffectAttr extends MoveEffectAttr { } } - if (user !== target && user.scene.arena.getTagOnSide(ArenaTagType.SAFEGUARD, targetSide)) { + if (user !== target && target.scene.arena.getTagOnSide(ArenaTagType.SAFEGUARD, target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY)) { if (move.category === MoveCategory.STATUS) { user.scene.queueMessage(i18next.t("moveTriggers:safeguard", { targetName: getPokemonNameWithAffix(target)})); }