From fbbf49620c882f7131705850dc534ff127a543c0 Mon Sep 17 00:00:00 2001
From: Stophles <71789013+Stophles@users.noreply.github.com>
Date: Thu, 11 Apr 2024 15:10:08 -0500
Subject: [PATCH] Fixed tag logic for traps

Ensured side is being checked to allow a one-sided tag like Stealth Rocks to be set on both sides instead of failing when it's already set on the other.
---
 src/field/arena.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/field/arena.ts b/src/field/arena.ts
index 4c712f7f36a..329c81861c4 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -479,7 +479,7 @@ export class Arena {
 	}
 
   addTag(tagType: ArenaTagType, turnCount: integer, sourceMove: Moves, sourceId: integer, side: ArenaTagSide = ArenaTagSide.BOTH, targetIndex?: BattlerIndex): boolean {
-    const existingTag = this.getTag(tagType);
+    const existingTag = this.getTag(tagType,side);
     if (existingTag) {
       existingTag.onOverlap(this);
       return false;
@@ -492,8 +492,8 @@ export class Arena {
     return true;
   }
 
-  getTag(tagType: ArenaTagType | { new(...args: any[]): ArenaTag }): ArenaTag {
-    return this.getTagOnSide(tagType, ArenaTagSide.BOTH);
+  getTag(tagType: ArenaTagType | { new(...args: any[]): ArenaTag }, side: ArenaTagSide = ArenaTagSide.BOTH): ArenaTag {
+    return this.getTagOnSide(tagType, side);
   }
 
   getTagOnSide(tagType: ArenaTagType | { new(...args: any[]): ArenaTag }, side: ArenaTagSide): ArenaTag {
@@ -517,9 +517,9 @@ export class Arena {
     });
   }
 
-  removeTag(tagType: ArenaTagType): boolean {
+  removeTag(tagType: ArenaTagType, side: ArenaTagSide = ArenaTagSide.BOTH): boolean {
     const tags = this.tags;
-    const tag = tags.find(t => t.tagType === tagType);
+    const tag = tags.find(t => t.tagType === tagType && t.side === side);
     if (tag) {
       tag.onRemove(this);
       tags.splice(tags.indexOf(tag), 1);
@@ -727,4 +727,4 @@ export class ArenaBase extends Phaser.GameObjects.Container {
       }, (this.scene as BattleScene).currentBattle?.waveIndex || 0, (this.scene as BattleScene).waveSeed);
     }
   }
-}
\ No newline at end of file
+}