fix(Scripts/BlackTemple): Illidan not accessing Akama's guid (azeroth…

…core#18665) init
sudlud · Apr 3, 2024 · 94ea109 · 94ea109
1 parent 40bbba6
commit 94ea109
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/data/sql/updates/pending_db_world/rev_1712171769662178600.sql b/data/sql/updates/pending_db_world/rev_1712171769662178600.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature` SET `spawntimesecs` = 60 WHERE  `guid` = 148735 AND `id1` = 23089;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -240,10 +240,10 @@ class boss_illidan_stormrage : public CreatureScript
 
         void EnterEvadeMode(EvadeReason why) override
         {
-            BossAI::EnterEvadeMode(why);
+            if (Creature* akama = instance->GetCreature(DATA_AKAMA_ILLIDAN))
+                akama->DespawnOrUnsummon();
 
-            if (Creature* akama = instance->GetCreature(NPC_AKAMA_ILLIDAN))
-                akama->AI()->EnterEvadeMode(why);
+            BossAI::EnterEvadeMode(why);
         }
 
         bool CanAIAttack(Unit const* target) const override
@@ -413,7 +413,7 @@ class boss_illidan_stormrage : public CreatureScript
             switch (events2.ExecuteEvent())
             {
                 case EVENT_SUMMON_MINIONS2:
-                    if (Creature* akama = instance->GetCreature(NPC_AKAMA_ILLIDAN))
+                    if (Creature* akama = instance->GetCreature(DATA_AKAMA_ILLIDAN))
                         akama->AI()->DoAction(ACTION_FIGHT_MINIONS);
                     break;
                 case EVENT_PHASE_2_EYE_BEAM_START:
@@ -450,7 +450,7 @@ class boss_illidan_stormrage : public CreatureScript
                         maiev->AI()->Talk(SAY_MAIEV_SHADOWSONG_ILLIDAN3);
                     }
 
-                    if (Creature* akama = instance->GetCreature(NPC_AKAMA_ILLIDAN))
+                    if (Creature* akama = instance->GetCreature(DATA_AKAMA_ILLIDAN))
                     {
                         akama->AI()->DoAction(ACTION_ILLIDAN_DEAD);
                         akama->SetTarget(me->GetGUID());
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		--
		UPDATE `creature` SET `spawntimesecs` = 60 WHERE `guid` = 148735 AND `id1` = 23089;