From 14f5849502e7c37f101506b48a37b3f5cc2d90f6 Mon Sep 17 00:00:00 2001
From: Bertie690 <taylormw163@gmail.com>
Date: Sat, 14 Jun 2025 13:55:24 -0400
Subject: [PATCH] Fixed cirrc dep isuse

---
 src/field/pokemon.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 91c91c64223..9e416f85acb 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -38,7 +38,6 @@ import {
   deltaRgb,
   isBetween,
   randSeedFloat,
-  type nil,
   type Constructor,
   randSeedIntRange,
   coerceArray,
@@ -4109,7 +4108,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   /**@overload */
-  getTag(tagType: BattlerTagType.GRUDGE): GrudgeTag | nil;
+  getTag(tagType: BattlerTagType.GRUDGE): GrudgeTag | undefined;
 
   /** @overload */
   getTag(tagType: BattlerTagType.SUBSTITUTE): SubstituteTag | undefined;
@@ -4790,9 +4789,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
       // If the user is semi-invulnerable when put asleep (such as due to Yawm),
       // remove their invulnerability and cancel the upcoming move from the queue
-      const invulnTag = this.getTag(SemiInvulnerableTag);
-      if (invulnTag) {
-        this.removeTag(invulnTag.tagType);
+      const invulnTagTypes = [
+        BattlerTagType.FLYING,
+        BattlerTagType.UNDERGROUND,
+        BattlerTagType.UNDERWATER,
+        BattlerTagType.HIDDEN,
+      ];
+
+      if (this.findTag(t => invulnTagTypes.includes(t.tagType))) {
+        this.findAndRemoveTags(t => invulnTagTypes.includes(t.tagType));
         this.getMoveQueue().shift();
       }
     }