diff --git a/src/data/move.ts b/src/data/move.ts index f9a814188..e14d835b8 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2824,7 +2824,7 @@ export class AddArenaTagAttr extends MoveEffectAttr { public tagType: ArenaTagType; public turnCount: integer; private failOnOverlap: boolean; - public selfSideTarget: boolean; + private selfSideTarget: boolean; constructor(tagType: ArenaTagType, turnCount?: integer, failOnOverlap: boolean = false, selfSideTarget: boolean = false) { super(true, MoveEffectTrigger.POST_APPLY, true); @@ -2857,7 +2857,7 @@ export class AddArenaTagAttr extends MoveEffectAttr { export class AddArenaTrapTagAttr extends AddArenaTagAttr { getCondition(): MoveConditionFunc { return (user, target, move) => { - if (move.category !== MoveCategory.STATUS || !user.scene.arena.getTagOnSide(this.tagType, (this.selfSideTarget ? user : target).isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY)) + if (move.category !== MoveCategory.STATUS || !user.scene.arena.getTag(this.tagType)) return true; const tag = user.scene.arena.getTag(this.tagType) as ArenaTrapTag; return tag.layers < tag.maxLayers; diff --git a/src/field/arena.ts b/src/field/arena.ts index 61c0e4964..5b14560d4 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -492,7 +492,7 @@ export class Arena { } addTag(tagType: ArenaTagType, turnCount: integer, sourceMove: Moves, sourceId: integer, side: ArenaTagSide = ArenaTagSide.BOTH, targetIndex?: BattlerIndex): boolean { - const existingTag = this.getTagOnSide(tagType, side); + const existingTag = this.getTag(tagType); if (existingTag) { existingTag.onOverlap(this); return false;