From 77ed0f2399d8cc8fe90795af211c7284787ea1cc Mon Sep 17 00:00:00 2001
From: Keader <keader.android@gmail.com>
Date: Thu, 8 Nov 2018 11:14:46 -0300
Subject: [PATCH] Scripts/ToC: Fixed Twin Valkyr stucking in progress and added
 hover

Closes: #22755
Update: #20961
(cherry picked from commit 4c6f0eaa8d2b680c98ba125b5c90748f31928eda)
---
 .../2021_11_15_31_world_2018_11_08_01_world.sql     | 13 +++++++++++++
 .../TrialOfTheCrusader/boss_twin_valkyr.cpp         | 10 +++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 sql/updates/world/master/2021_11_15_31_world_2018_11_08_01_world.sql

diff --git a/sql/updates/world/master/2021_11_15_31_world_2018_11_08_01_world.sql b/sql/updates/world/master/2021_11_15_31_world_2018_11_08_01_world.sql
new file mode 100644
index 00000000000..70e324aa8bc
--- /dev/null
+++ b/sql/updates/world/master/2021_11_15_31_world_2018_11_08_01_world.sql
@@ -0,0 +1,13 @@
+UPDATE `creature_template` SET `HoverHeight`=6 WHERE `entry` IN (35347,35348,35349,35350,35351,35352);
+UPDATE `creature_template_addon` SET `bytes1`=0x2000000 WHERE `entry` IN (34496,34497,35347,35348,35349,35350,35351,35352);
+
+DELETE FROM `creature_template_movement` WHERE `CreatureId` IN (34496,34497,35347,35348,35349,35350,35351,35352);
+INSERT INTO `creature_template_movement` (`CreatureId`,`Ground`,`Swim`,`Flight`,`Rooted`) VALUES
+(34496,2,0,0,0),
+(34497,2,0,0,0),
+(35347,2,0,0,0),
+(35348,2,0,0,0),
+(35349,2,0,0,0),
+(35350,2,0,0,0),
+(35351,2,0,0,0),
+(35352,2,0,0,0);
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index 06c786ff2ab..9943a77b159 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -182,11 +182,12 @@ struct boss_twin_baseAI : public BossAI
     {
         me->SetReactState(REACT_PASSIVE);
         me->ModifyAuraState(AuraState, true);
-        /* Uncomment this once that they are floating above the ground
-        me->SetLevitate(true);
-        me->SetFlying(true); */
-
         summons.DespawnAll();
+    }
+
+    void JustAppeared() override
+    {
+        events.Reset();
         events.SetPhase(PHASE_EVENT);
         events.ScheduleEvent(EVENT_START_MOVE, 4s);
     }
@@ -447,7 +448,6 @@ class boss_fjola : public CreatureScript
             void JustReachedHome() override
             {
                 instance->DoUseDoorOrButton(instance->GetGuidData(DATA_MAIN_GATE));
-
                 boss_twin_baseAI::JustReachedHome();
             }