From 8dced9fcf17bace8a808d8d7031db91372698fc9 Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Mon, 27 Mar 2023 22:52:18 -0300
Subject: [PATCH] =?UTF-8?q?fix(Scripts/IcecrownCitadel):=20Fix=20Blood-Que?=
 =?UTF-8?q?en=20Lana`thel=20reset=20and=20fli=E2=80=A6=20(#15601)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(Scripts/IcecrownCitadel): Fix Blood-Queen Lana`thel reset and flickering animation
---
 .../rev_1679896171803644000.sql               |  2 ++
 .../boss_blood_queen_lana_thel.cpp            | 25 ++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1679896171803644000.sql

diff --git a/data/sql/updates/pending_db_world/rev_1679896171803644000.sql b/data/sql/updates/pending_db_world/rev_1679896171803644000.sql
new file mode 100644
index 000000000..63be9c10f
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1679896171803644000.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `flags_extra` = `flags_extra` | 512 WHERE `entry` IN (37955, 38434, 38435, 38436);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index a966f27bc..87447c1a9 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -164,6 +164,17 @@ public:
 
             events.Reset();
             summons.DespawnAll();
+
+            me->SetCanFly(false);
+            me->SetDisableGravity(false);
+
+            if (bEnteredCombat)
+            {
+                bEnteredCombat = false;
+                if (me->IsAlive() && instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != DONE)
+                    instance->SetBossState(DATA_BLOOD_QUEEN_LANA_THEL, FAIL);
+            }
+
             if (instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != DONE)
                 instance->SetBossState(DATA_BLOOD_QUEEN_LANA_THEL, NOT_STARTED);
         }
@@ -253,20 +264,6 @@ public:
                 GoToMinchar();
         }
 
-        void JustReachedHome() override
-        {
-            me->SetCanFly(false);
-            me->SetDisableGravity(false);
-
-            _JustReachedHome();
-            if (bEnteredCombat)
-            {
-                bEnteredCombat = false;
-                if (me->IsAlive() && instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != DONE)
-                    instance->SetBossState(DATA_BLOOD_QUEEN_LANA_THEL, FAIL);
-            }
-        }
-
         void KilledUnit(Unit* victim) override
         {
             if (victim->GetTypeId() == TYPEID_PLAYER)