From 9aee5c41e2e969e40e3497234dcaacf08af5dfb2 Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Tue, 21 Mar 2023 15:05:04 -0300
Subject: [PATCH] fix(Scripts/Misc): Fix bosses not reseting after the despawn
 update (#15507)

* fix bosses not reseting

* fix lk

* fix tirion not respawning

* up
---
 .../rev_1679368320710232700.sql               |  2 ++
 .../RubySanctum/boss_halion.cpp               | 11 ++----
 .../IcecrownCitadel/boss_the_lich_king.cpp    | 34 +++++++++----------
 3 files changed, 22 insertions(+), 25 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1679368320710232700.sql

diff --git a/data/sql/updates/pending_db_world/rev_1679368320710232700.sql b/data/sql/updates/pending_db_world/rev_1679368320710232700.sql
new file mode 100644
index 000000000..b78c74254
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1679368320710232700.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature` WHERE `guid` = 150212;
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index dbf583d55..72f8554ae 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -277,6 +277,9 @@ public:
             if (IsAnyPlayerValid())
                 return;
 
+            instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
+            if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_HALION_CONTROLLER)))
+                controller->AI()->DoAction(ACTION_RESET_ENCOUNTER);
             BossAI::EnterEvadeMode(why);
         }
 
@@ -286,14 +289,6 @@ public:
             BossAI::AttackStart(who);
         }
 
-        void JustReachedHome() override
-        {
-            instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
-            if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_HALION_CONTROLLER)))
-                controller->AI()->DoAction(ACTION_RESET_ENCOUNTER);
-            BossAI::JustReachedHome();
-        }
-
         void JustEngagedWith(Unit* who) override
         {
             BossAI::JustEngagedWith(who);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
index f73a557c6..85ceb9d3d 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
@@ -308,6 +308,7 @@ enum Phases
 };
 
 Position const CenterPosition     = {503.6282f, -2124.655f, 840.8569f, 0.0f};
+Position const TirionSpawn        = { 505.2118f, -2124.353f, 840.9403f, 3.141593f };
 Position const TirionIntro        = {488.2970f, -2124.840f, 840.8569f, 0.0f};
 Position const TirionCharge       = {472.8500f, -2124.350f, 840.8570f, 0.0f};
 Position const LichKingIntro[3]   = { {432.0851f, -2123.673f, 864.6582f, 0.0f}, {457.8351f, -2123.423f, 841.1582f, 0.0f}, {465.0730f, -2123.470f, 840.8569f, 0.0f} };
@@ -660,6 +661,21 @@ public:
             SetEquipmentSlots(true);
             if (me->IsImmuneToPC())
                 me->SetStandState(UNIT_STAND_STATE_SIT);
+
+            DoAction(ACTION_RESTORE_LIGHT);
+
+            // Reset The Frozen Throne gameobjects
+            FrozenThroneResetWorker reset;
+            Acore::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset);
+            Cell::VisitGridObjects(me, worker, 333.0f);
+
+            me->AddAura(SPELL_EMOTE_SIT_NO_SHEATH, me);
+            me->SetImmuneToPC(true);
+            me->SetReactState(REACT_PASSIVE);
+            me->SetStandState(UNIT_STAND_STATE_SIT);
+
+            if (!ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_HIGHLORD_TIRION_FORDRING)))
+                me->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING_LK, TirionSpawn, TEMPSUMMON_MANUAL_DESPAWN);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -693,22 +709,6 @@ public:
                 events.ScheduleEvent(EVENT_SHADOW_TRAP, 15s + 500ms, EVENT_GROUP_ABILITIES);
         }
 
-        void JustReachedHome() override
-        {
-            _JustReachedHome();
-            DoAction(ACTION_RESTORE_LIGHT);
-
-            // Reset The Frozen Throne gameobjects
-            FrozenThroneResetWorker reset;
-            Acore::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset);
-            Cell::VisitGridObjects(me, worker, 333.0f);
-
-            me->AddAura(SPELL_EMOTE_SIT_NO_SHEATH, me);
-            me->SetImmuneToPC(true);
-            me->SetReactState(REACT_PASSIVE);
-            me->SetStandState(UNIT_STAND_STATE_SIT);
-        }
-
         bool CanAIAttack(Unit const* target) const override
         {
             return me->IsVisible() && IsValidPlatformTarget(target) && !target->GetVehicle();
@@ -1262,7 +1262,7 @@ public:
             me->SetReactState(REACT_AGGRESSIVE);
 
             if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_HIGHLORD_TIRION_FORDRING)))
-                tirion->AI()->EnterEvadeMode();
+                tirion->DespawnOrUnsummon();
         }
     };