NPCBots: Fix Sindragosa's Ice Tomb on bots being permanent and withou…

…t visual
trickerer · Oct 25, 2024 · 03def08 · 03def08
1 parent 8eba0fc
commit 03def08
Showing 1 changed file with 29 additions and 0 deletions.
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -609,6 +609,20 @@ struct npc_ice_tomb : public ScriptedAI
     {
         me->RemoveAllGameObjects();
 
+        //npcbot
+        if (_trappedPlayerGUID.IsCreature())
+        {
+            if (Creature* bot = ObjectAccessor::GetCreature(*me, _trappedPlayerGUID))
+            {
+                _trappedPlayerGUID.Clear();
+                bot->RemoveAurasDueToSpell(SPELL_ICE_TOMB_DAMAGE);
+                bot->RemoveAurasDueToSpell(SPELL_ASPHYXIATION);
+                bot->RemoveAurasDueToSpell(SPELL_ICE_TOMB_UNTARGETABLE);
+            }
+            return;
+        }
+        //end npcbot
+
         if (Player* player = ObjectAccessor::GetPlayer(*me, _trappedPlayerGUID))
         {
             _trappedPlayerGUID.Clear();
@@ -625,6 +639,21 @@ struct npc_ice_tomb : public ScriptedAI
 
         if (_existenceCheckTimer <= diff)
         {
+            //npcbot
+            if (_trappedPlayerGUID.IsCreature())
+            {
+                Creature* bot = ObjectAccessor::GetCreature(*me, _trappedPlayerGUID);
+                if (!bot || !bot->IsAlive() || !bot->HasAura(SPELL_ICE_TOMB_DAMAGE))
+                {
+                    JustDied(me);
+                    me->DespawnOrUnsummon();
+                    return;
+                }
+                _existenceCheckTimer = 1000;
+                return;
+            }
+            //end npcbot
+
             Player* player = ObjectAccessor::GetPlayer(*me, _trappedPlayerGUID);
             if (!player || player->isDead() || !player->HasAura(SPELL_ICE_TOMB_DAMAGE))
             {