From aa24f50a032f3f0b14b42aba02718a7e50724021 Mon Sep 17 00:00:00 2001
From: Andrew <47818697+Nyeriah@users.noreply.github.com>
Date: Thu, 26 Dec 2024 05:51:02 -0300
Subject: [PATCH] chore(Scripts/SSC): Move Vashj summons to the new format
 (#21042)

---
 .../SerpentShrine/instance_serpent_shrine.cpp | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
index 5df41e6fa4a575..5ac0206e412a1f 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -64,6 +64,15 @@ BossBoundaryData const boundaries =
     { DATA_LADY_VASHJ,             new CircleBoundary(Position(29.99f, -922.409f), 83.65f) }
 };
 
+ObjectData const summonData[] =
+{
+    { NPC_ENCHANTED_ELEMENTAL, DATA_LADY_VASHJ },
+    { NPC_COILFANG_ELITE,      DATA_LADY_VASHJ },
+    { NPC_COILFANG_STRIDER,    DATA_LADY_VASHJ },
+    { NPC_TAINTED_ELEMENTAL,   DATA_LADY_VASHJ },
+    { 0, 0 }
+};
+
 class instance_serpent_shrine : public InstanceMapScript
 {
 public:
@@ -81,6 +90,7 @@ class instance_serpent_shrine : public InstanceMapScript
             LoadObjectData(creatureData, gameObjectData);
             LoadMinionData(minionData);
             LoadBossBoundaries(boundaries);
+            LoadSummonData(summonData);
 
             _aliveKeepersCount = 0;
         }
@@ -125,13 +135,6 @@ class instance_serpent_shrine : public InstanceMapScript
                 case NPC_CYCLONE_KARATHRESS:
                     creature->GetMotionMaster()->MoveRandom(50.0f);
                     break;
-                case NPC_ENCHANTED_ELEMENTAL:
-                case NPC_COILFANG_ELITE:
-                case NPC_COILFANG_STRIDER:
-                case NPC_TAINTED_ELEMENTAL:
-                    if (Creature* vashj = GetCreature(DATA_LADY_VASHJ))
-                        vashj->AI()->JustSummoned(creature);
-                    break;
                 case NPC_SEER_OLUM:
                     creature->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
                     creature->RemoveNpcFlag(UNIT_NPC_FLAG_QUESTGIVER);
@@ -148,15 +151,11 @@ class instance_serpent_shrine : public InstanceMapScript
             {
                 case DATA_PLATFORM_KEEPER_RESPAWNED:
                     if (_aliveKeepersCount < MAX_KEEPER_COUNT)
-                    {
                         ++_aliveKeepersCount;
-                    }
                     break;
                 case DATA_PLATFORM_KEEPER_DIED:
                     if (_aliveKeepersCount > MIN_KEEPER_COUNT)
-                    {
                         --_aliveKeepersCount;
-                    }
                     break;
                 case DATA_BRIDGE_ACTIVATED:
                     SetBossState(DATA_BRIDGE_EMERGED, NOT_STARTED);