From 2e7003d84ef6ab305c82c8576010fb5a20d1295a Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Sat, 8 Jul 2023 09:23:01 -0300
Subject: [PATCH 01/46] fix(Scripts/Outlands): Fix Doomwalker not reseting
 abilities (#16700)

---
 src/server/scripts/Outland/boss_doomwalker.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index 1838b9835..de61c6877 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -50,6 +50,7 @@ public:
         void Reset() override
         {
             _inEnrage = false;
+            _scheduler.CancelAll();
         }
 
         void KilledUnit(Unit* victim) override

From 998bb9d54bc84cae77ba05f02ac71931d0b7a51b Mon Sep 17 00:00:00 2001
From: avarishd <46330494+avarishd@users.noreply.github.com>
Date: Sat, 8 Jul 2023 16:03:03 +0300
Subject: [PATCH 02/46] fix(Core/Spells): Shriveling Gaze (#15939)

* fix(Core/Spells): Shriveling Gaze

* comment out unused parameter

* again
---
 .../rev_1681398806458012400.sql               |  4 +++
 src/server/scripts/Spells/spell_generic.cpp   | 36 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1681398806458012400.sql

diff --git a/data/sql/updates/pending_db_world/rev_1681398806458012400.sql b/data/sql/updates/pending_db_world/rev_1681398806458012400.sql
new file mode 100644
index 000000000..017c28de5
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1681398806458012400.sql
@@ -0,0 +1,4 @@
+-- Shriveling Gaze
+DELETE FROM `spell_script_names` WHERE `spell_id` = 37589;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(37589,'spell_gen_shriveling_gaze');
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 0acf396ff..4001a5327 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -4814,6 +4814,7 @@ class spell_freezing_circle : public SpellScript
     }
 };
 
+// 35385 - Threshalisk Charge
 enum Threshalisk
 {
     SPELL_THRESHALISK_CHARGE = 35385,
@@ -4849,6 +4850,40 @@ class spell_gen_threshalisk_charge : public SpellScript
     }
 };
 
+// 37589 - Shriveling Gaze
+enum ShrivelingGaze
+{
+    SPELL_SHRIVELING_GAZE         = 37589,
+    SPELL_SHRIVELING_GAZE_REMOVAL = 30023, // Serverside - Gushing Wound Removal
+};
+
+class spell_gen_shriveling_gaze : public AuraScript
+{
+    PrepareAuraScript(spell_gen_shriveling_gaze);
+
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_SHRIVELING_GAZE });
+    }
+
+    void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        ModStackAmount(20);
+    }
+
+    void OnPeriodic(AuraEffect const* /*aurEff*/)
+    {
+        PreventDefaultAction();
+        ModStackAmount(-1);
+    }
+
+    void Register() override
+    {
+        OnEffectApply += AuraEffectApplyFn(spell_gen_shriveling_gaze::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
+        OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_shriveling_gaze::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
+    }
+};
+
 void AddSC_generic_spell_scripts()
 {
     RegisterSpellScript(spell_silithyst);
@@ -4993,4 +5028,5 @@ void AddSC_generic_spell_scripts()
     RegisterSpellScript(spell_gen_basic_campfire);
     RegisterSpellScript(spell_freezing_circle);
     RegisterSpellScript(spell_gen_threshalisk_charge);
+    RegisterSpellScript(spell_gen_shriveling_gaze);
 }

From 6ced149b932785686e8da4f3523e42c32ee8614b Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sat, 8 Jul 2023 13:05:18 +0000
Subject: [PATCH 03/46] chore(DB): import pending files

Referenced commit(s): 998bb9d54bc84cae77ba05f02ac71931d0b7a51b
---
 .../rev_1681398806458012400.sql => db_world/2023_07_08_00.sql}   | 1 +
 1 file changed, 1 insertion(+)
 rename data/sql/updates/{pending_db_world/rev_1681398806458012400.sql => db_world/2023_07_08_00.sql} (80%)

diff --git a/data/sql/updates/pending_db_world/rev_1681398806458012400.sql b/data/sql/updates/db_world/2023_07_08_00.sql
similarity index 80%
rename from data/sql/updates/pending_db_world/rev_1681398806458012400.sql
rename to data/sql/updates/db_world/2023_07_08_00.sql
index 017c28de5..23f7ced41 100644
--- a/data/sql/updates/pending_db_world/rev_1681398806458012400.sql
+++ b/data/sql/updates/db_world/2023_07_08_00.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_02_00 -> 2023_07_08_00
 -- Shriveling Gaze
 DELETE FROM `spell_script_names` WHERE `spell_id` = 37589;
 INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES

From b56c4d1657bf811e179e12f8de823f8cd327d343 Mon Sep 17 00:00:00 2001
From: Dan <83884799+elthehablo@users.noreply.github.com>
Date: Sat, 8 Jul 2023 19:41:09 +0200
Subject: [PATCH 04/46] fix(DB/SAI): fix Blackpaw Shaman Combat Movement
 (#16706)

* initial

* Update remove-garbage-sql-ai-handling-and-add-simple-sai.sql

fixes according to review
---
 .../remove-garbage-sql-ai-handling-and-add-simple-sai.sql   | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/remove-garbage-sql-ai-handling-and-add-simple-sai.sql

diff --git a/data/sql/updates/pending_db_world/remove-garbage-sql-ai-handling-and-add-simple-sai.sql b/data/sql/updates/pending_db_world/remove-garbage-sql-ai-handling-and-add-simple-sai.sql
new file mode 100644
index 000000000..ddd7405f4
--- /dev/null
+++ b/data/sql/updates/pending_db_world/remove-garbage-sql-ai-handling-and-add-simple-sai.sql
@@ -0,0 +1,6 @@
+-- remove old SAI trying to script mob behaviour (see AC issue for old SAI) and add simple behaviour equivalent to Riverpaw Mystic
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 16337 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(16337, 0, 0, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 0, 11, 20802, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Blackpaw Shaman - In Combat CMC - Cast \'Lightning Bolt\''),
+(16337, 0, 1, 0, 2, 0, 100, 1, 0, 30, 15000, 25000, 0, 11, 28902, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Blackpaw Shaman - Between 0-30% Health - Cast \'Bloodlust\''),
+(16337, 0, 2, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Blackpaw Shaman - Between 0-15% Health - Flee For Assist (No Repeat)');

From 1e3d5ab2048cb4f5b1bf6baa38168a69009d319c Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sat, 8 Jul 2023 17:43:29 +0000
Subject: [PATCH 05/46] chore(DB): import pending files

Referenced commit(s): b56c4d1657bf811e179e12f8de823f8cd327d343
---
 .../2023_07_08_01.sql}                                           | 1 +
 1 file changed, 1 insertion(+)
 rename data/sql/updates/{pending_db_world/remove-garbage-sql-ai-handling-and-add-simple-sai.sql => db_world/2023_07_08_01.sql} (96%)

diff --git a/data/sql/updates/pending_db_world/remove-garbage-sql-ai-handling-and-add-simple-sai.sql b/data/sql/updates/db_world/2023_07_08_01.sql
similarity index 96%
rename from data/sql/updates/pending_db_world/remove-garbage-sql-ai-handling-and-add-simple-sai.sql
rename to data/sql/updates/db_world/2023_07_08_01.sql
index ddd7405f4..d4f132718 100644
--- a/data/sql/updates/pending_db_world/remove-garbage-sql-ai-handling-and-add-simple-sai.sql
+++ b/data/sql/updates/db_world/2023_07_08_01.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_08_00 -> 2023_07_08_01
 -- remove old SAI trying to script mob behaviour (see AC issue for old SAI) and add simple behaviour equivalent to Riverpaw Mystic
 DELETE FROM `smart_scripts` WHERE `entryorguid` = 16337 AND `source_type` = 0;
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES

From 1d0c86f0c8f9a09bac66edaefc5accbc17406692 Mon Sep 17 00:00:00 2001
From: Dan <83884799+elthehablo@users.noreply.github.com>
Date: Sat, 8 Jul 2023 19:46:22 +0200
Subject: [PATCH 06/46] fix(DB/SAI): Gnarlpine Mystic uses the right 'Wrath'
 (#16690)

initial

yes

Co-authored-by: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com>
---
 data/sql/updates/pending_db_world/gnarlpine-mystic-wrath.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/gnarlpine-mystic-wrath.sql

diff --git a/data/sql/updates/pending_db_world/gnarlpine-mystic-wrath.sql b/data/sql/updates/pending_db_world/gnarlpine-mystic-wrath.sql
new file mode 100644
index 000000000..c4de26040
--- /dev/null
+++ b/data/sql/updates/pending_db_world/gnarlpine-mystic-wrath.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `smart_scripts` SET `action_param1` = 9739 WHERE `entryorguid` = 7235 AND `source_type` = 0; -- action_param1 was 5177 AKA wrong Wrath

From b17e29fbdd20c5922ec7f13ff8ef5b81ddebfcd1 Mon Sep 17 00:00:00 2001
From: v-mstrs <104088833+v-mstrs@users.noreply.github.com>
Date: Sat, 8 Jul 2023 19:46:50 +0200
Subject: [PATCH 07/46] fix(DB/SAI) Cabal Spellbinder adjustment to Spell Shock
 target type (#16648)

* Change event to VICTIM_CASTING
---
 data/sql/updates/pending_db_world/rev_1688085865524921702.sql | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1688085865524921702.sql

diff --git a/data/sql/updates/pending_db_world/rev_1688085865524921702.sql b/data/sql/updates/pending_db_world/rev_1688085865524921702.sql
new file mode 100644
index 000000000..441542267
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1688085865524921702.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 18639 AND `id`=1);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(18639, 0, 1, 0, 13, 0, 100, 0, 9600, 16900, 0, 0, 0, 11, 32691, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Cabal Spellbinder - On Victim Casting - Cast \'Spell Shock\'');

From f0ab44fc82bd6f98396d16ea1db92f465ee670f8 Mon Sep 17 00:00:00 2001
From: The GhostRider <xspidey@hotmail.it>
Date: Sat, 8 Jul 2023 18:47:53 +0100
Subject: [PATCH 08/46] fix(DB/SAI): Un'Goro's Crystal Pylons (#16605)

* Fix(SAI/GameObjects): Un'Goro's Crystal Pylons
---
 .../pending_db_world/rev_1687452642453114500.sql      | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1687452642453114500.sql

diff --git a/data/sql/updates/pending_db_world/rev_1687452642453114500.sql b/data/sql/updates/pending_db_world/rev_1687452642453114500.sql
new file mode 100644
index 000000000..2e5a6bfe5
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1687452642453114500.sql
@@ -0,0 +1,11 @@
+-- Fix Un'goro's Crystal Pylons --
+UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` IN (164955, 164956, 164957);
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 1 AND `entryorguid` IN (164955, 164956, 164957));
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(164955, 1, 0, 1, 62, 0, 100, 0, 2177, 0, 0, 0, 0, 15, 4285, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Northern Crystal Pylon - On Gossip Option 0 Selected - Quest Credit \'The Northern Pylon\''),
+(164955, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Northern Crystal Pylon - On Gossip Option 0 Selected - Close Gossip'),
+(164956, 1, 0, 1, 62, 0, 100, 0, 2179, 0, 0, 0, 0, 15, 4288, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Western Crystal Pylon - On Gossip Option 0 Selected - Quest Credit \'The Western Pylon\''),
+(164956, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Western Crystal Pylon - On Gossip Option 0 Selected - Close Gossip'),
+(164957, 1, 0, 1, 62, 0, 100, 0, 2178, 0, 0, 0, 0, 15, 4287, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Eastern Crystal Pylon - On Gossip Option 0 Selected - Quest Credit \'The Eastern Pylon\''),
+(164957, 1, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Eastern Crystal Pylon - On Gossip Option 0 Selected - Close Gossip');

From b9cd0fd8a6fa86a3b05d4190d807f756aa8ab0b6 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sat, 8 Jul 2023 17:50:08 +0000
Subject: [PATCH 09/46] chore(DB): import pending files

Referenced commit(s): f0ab44fc82bd6f98396d16ea1db92f465ee670f8
---
 .../gnarlpine-mystic-wrath.sql => db_world/2023_07_08_02.sql}    | 1 +
 .../rev_1687452642453114500.sql => db_world/2023_07_08_03.sql}   | 1 +
 .../rev_1688085865524921702.sql => db_world/2023_07_08_04.sql}   | 1 +
 3 files changed, 3 insertions(+)
 rename data/sql/updates/{pending_db_world/gnarlpine-mystic-wrath.sql => db_world/2023_07_08_02.sql} (76%)
 rename data/sql/updates/{pending_db_world/rev_1687452642453114500.sql => db_world/2023_07_08_03.sql} (97%)
 rename data/sql/updates/{pending_db_world/rev_1688085865524921702.sql => db_world/2023_07_08_04.sql} (94%)

diff --git a/data/sql/updates/pending_db_world/gnarlpine-mystic-wrath.sql b/data/sql/updates/db_world/2023_07_08_02.sql
similarity index 76%
rename from data/sql/updates/pending_db_world/gnarlpine-mystic-wrath.sql
rename to data/sql/updates/db_world/2023_07_08_02.sql
index c4de26040..2241340b5 100644
--- a/data/sql/updates/pending_db_world/gnarlpine-mystic-wrath.sql
+++ b/data/sql/updates/db_world/2023_07_08_02.sql
@@ -1,2 +1,3 @@
+-- DB update 2023_07_08_01 -> 2023_07_08_02
 --
 UPDATE `smart_scripts` SET `action_param1` = 9739 WHERE `entryorguid` = 7235 AND `source_type` = 0; -- action_param1 was 5177 AKA wrong Wrath
diff --git a/data/sql/updates/pending_db_world/rev_1687452642453114500.sql b/data/sql/updates/db_world/2023_07_08_03.sql
similarity index 97%
rename from data/sql/updates/pending_db_world/rev_1687452642453114500.sql
rename to data/sql/updates/db_world/2023_07_08_03.sql
index 2e5a6bfe5..d6717f18c 100644
--- a/data/sql/updates/pending_db_world/rev_1687452642453114500.sql
+++ b/data/sql/updates/db_world/2023_07_08_03.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_08_02 -> 2023_07_08_03
 -- Fix Un'goro's Crystal Pylons --
 UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` IN (164955, 164956, 164957);
 
diff --git a/data/sql/updates/pending_db_world/rev_1688085865524921702.sql b/data/sql/updates/db_world/2023_07_08_04.sql
similarity index 94%
rename from data/sql/updates/pending_db_world/rev_1688085865524921702.sql
rename to data/sql/updates/db_world/2023_07_08_04.sql
index 441542267..42a40891e 100644
--- a/data/sql/updates/pending_db_world/rev_1688085865524921702.sql
+++ b/data/sql/updates/db_world/2023_07_08_04.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_08_03 -> 2023_07_08_04
 --
 DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 18639 AND `id`=1);
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES

From cfcde268c44c87460bddfb4fff6787a804be9cfc Mon Sep 17 00:00:00 2001
From: v-mstrs <104088833+v-mstrs@users.noreply.github.com>
Date: Sat, 8 Jul 2023 21:13:07 +0200
Subject: [PATCH 10/46] chore(DB/Quest): Fix typo in quest reward offer text
 for ID 9145 (#16686)

---
 data/sql/updates/pending_db_world/rev_1688730531283365116.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1688730531283365116.sql

diff --git a/data/sql/updates/pending_db_world/rev_1688730531283365116.sql b/data/sql/updates/pending_db_world/rev_1688730531283365116.sql
new file mode 100644
index 000000000..7a785b9bf
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1688730531283365116.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `quest_offer_reward` SET `RewardText` = 'Good to hear that Lethvalin made it to safety, and that he was smart enough to ask you for help instead of just waiting there.$B$BI hope that Ranger Salissa made it safely to Farstrider Enclave.' WHERE (`ID` = 9145);

From 8c75495cf25f123a196072494174ae7d685d1dff Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sat, 8 Jul 2023 19:15:23 +0000
Subject: [PATCH 11/46] chore(DB): import pending files

Referenced commit(s): cfcde268c44c87460bddfb4fff6787a804be9cfc
---
 .../rev_1688730531283365116.sql => db_world/2023_07_08_05.sql}   | 1 +
 1 file changed, 1 insertion(+)
 rename data/sql/updates/{pending_db_world/rev_1688730531283365116.sql => db_world/2023_07_08_05.sql} (85%)

diff --git a/data/sql/updates/pending_db_world/rev_1688730531283365116.sql b/data/sql/updates/db_world/2023_07_08_05.sql
similarity index 85%
rename from data/sql/updates/pending_db_world/rev_1688730531283365116.sql
rename to data/sql/updates/db_world/2023_07_08_05.sql
index 7a785b9bf..64b6302f3 100644
--- a/data/sql/updates/pending_db_world/rev_1688730531283365116.sql
+++ b/data/sql/updates/db_world/2023_07_08_05.sql
@@ -1,2 +1,3 @@
+-- DB update 2023_07_08_04 -> 2023_07_08_05
 --
 UPDATE `quest_offer_reward` SET `RewardText` = 'Good to hear that Lethvalin made it to safety, and that he was smart enough to ask you for help instead of just waiting there.$B$BI hope that Ranger Salissa made it safely to Farstrider Enclave.' WHERE (`ID` = 9145);

From 49553941ac010638b8d5979fee7a92bec7b6ca26 Mon Sep 17 00:00:00 2001
From: wowquester <138876396+wowquester@users.noreply.github.com>
Date: Sun, 9 Jul 2023 01:00:05 +0200
Subject: [PATCH 12/46] chore(DB/Quest): Fix typo in quest reward offer for ID
 9175 (#16695)

* fix(DB/quest): 9175 - Fixing typo

* Update data/sql/updates/pending_db_world/fix-quest-9175-typo.sql
---
 data/sql/updates/pending_db_world/fix-quest-9175-typo.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 data/sql/updates/pending_db_world/fix-quest-9175-typo.sql

diff --git a/data/sql/updates/pending_db_world/fix-quest-9175-typo.sql b/data/sql/updates/pending_db_world/fix-quest-9175-typo.sql
new file mode 100644
index 000000000..2b3320aff
--- /dev/null
+++ b/data/sql/updates/pending_db_world/fix-quest-9175-typo.sql
@@ -0,0 +1 @@
+UPDATE `quest_offer_reward` SET `RewardText` = 'You say that you found it on one of the Scourge at Windrunner Spire and that there\'s an inscription on it? Let me see!$B$BHere, take this coin for a job well done.' WHERE (`ID` = 9175);

From d9d8c986f7cbccbca633d7bae8d565825e54893a Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sat, 8 Jul 2023 23:02:34 +0000
Subject: [PATCH 13/46] chore(DB): import pending files

Referenced commit(s): 49553941ac010638b8d5979fee7a92bec7b6ca26
---
 .../fix-quest-9175-typo.sql => db_world/2023_07_08_06.sql}       | 1 +
 1 file changed, 1 insertion(+)
 rename data/sql/updates/{pending_db_world/fix-quest-9175-typo.sql => db_world/2023_07_08_06.sql} (84%)

diff --git a/data/sql/updates/pending_db_world/fix-quest-9175-typo.sql b/data/sql/updates/db_world/2023_07_08_06.sql
similarity index 84%
rename from data/sql/updates/pending_db_world/fix-quest-9175-typo.sql
rename to data/sql/updates/db_world/2023_07_08_06.sql
index 2b3320aff..da48ecb0e 100644
--- a/data/sql/updates/pending_db_world/fix-quest-9175-typo.sql
+++ b/data/sql/updates/db_world/2023_07_08_06.sql
@@ -1 +1,2 @@
+-- DB update 2023_07_08_05 -> 2023_07_08_06
 UPDATE `quest_offer_reward` SET `RewardText` = 'You say that you found it on one of the Scourge at Windrunner Spire and that there\'s an inscription on it? Let me see!$B$BHere, take this coin for a job well done.' WHERE (`ID` = 9175);

From 66520372f6670c1504b1b2a238666986790d8b1b Mon Sep 17 00:00:00 2001
From: Eddy Vega <61223313+Si1ker@users.noreply.github.com>
Date: Sat, 8 Jul 2023 17:06:25 -0600
Subject: [PATCH 14/46] fix(DB/Creature): Turn 'Guard Untula' as female
 (#16568)

init

Co-authored-by: Wyreth <Wyreth@users.noreply.github.com>
---
 data/sql/updates/pending_db_world/rev_1687015554834488300.sql | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1687015554834488300.sql

diff --git a/data/sql/updates/pending_db_world/rev_1687015554834488300.sql b/data/sql/updates/pending_db_world/rev_1687015554834488300.sql
new file mode 100644
index 000000000..43851ef91
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1687015554834488300.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `creature_model_info` SET `DisplayID_Other_Gender`=0 WHERE `DisplayID`=18309;
+

From c4d94c80f38a162a783dda62708afaad71a820d6 Mon Sep 17 00:00:00 2001
From: Eddy Vega <61223313+Si1ker@users.noreply.github.com>
Date: Sat, 8 Jul 2023 17:07:37 -0600
Subject: [PATCH 15/46] fix(DB/Creature): Add correct stealth to Crag Stalker
 (#16574)

* init

Co-authored-by: CraftedRO <CraftedRO@users.noreply.github.com>
---
 .../updates/pending_db_world/rev_1687028319280087800.sql    | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1687028319280087800.sql

diff --git a/data/sql/updates/pending_db_world/rev_1687028319280087800.sql b/data/sql/updates/pending_db_world/rev_1687028319280087800.sql
new file mode 100644
index 000000000..2b960c31d
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1687028319280087800.sql
@@ -0,0 +1,6 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4126 AND `source_type` = 0 AND `id` = 0;
+DELETE FROM `creature_template_addon` WHERE `entry` = 4126;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES (4126, 0, 0, 0, 1, 0, 0, '22766');
+UPDATE `smart_scripts` SET `id`=0 WHERE `entryorguid`=4126 AND `source_type`=0 AND `id`=1 AND `link`=0;
+

From 486769dbb5adf96aadeab1c87111b6d678e43ffd Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sat, 8 Jul 2023 23:09:54 +0000
Subject: [PATCH 16/46] chore(DB): import pending files

Referenced commit(s): c4d94c80f38a162a783dda62708afaad71a820d6
---
 .../rev_1687015554834488300.sql => db_world/2023_07_08_07.sql}   | 1 +
 .../rev_1687028319280087800.sql => db_world/2023_07_08_08.sql}   | 1 +
 2 files changed, 2 insertions(+)
 rename data/sql/updates/{pending_db_world/rev_1687015554834488300.sql => db_world/2023_07_08_07.sql} (66%)
 rename data/sql/updates/{pending_db_world/rev_1687028319280087800.sql => db_world/2023_07_08_08.sql} (90%)

diff --git a/data/sql/updates/pending_db_world/rev_1687015554834488300.sql b/data/sql/updates/db_world/2023_07_08_07.sql
similarity index 66%
rename from data/sql/updates/pending_db_world/rev_1687015554834488300.sql
rename to data/sql/updates/db_world/2023_07_08_07.sql
index 43851ef91..272e242d1 100644
--- a/data/sql/updates/pending_db_world/rev_1687015554834488300.sql
+++ b/data/sql/updates/db_world/2023_07_08_07.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_08_06 -> 2023_07_08_07
 --
 UPDATE `creature_model_info` SET `DisplayID_Other_Gender`=0 WHERE `DisplayID`=18309;
 
diff --git a/data/sql/updates/pending_db_world/rev_1687028319280087800.sql b/data/sql/updates/db_world/2023_07_08_08.sql
similarity index 90%
rename from data/sql/updates/pending_db_world/rev_1687028319280087800.sql
rename to data/sql/updates/db_world/2023_07_08_08.sql
index 2b960c31d..d1cc393a6 100644
--- a/data/sql/updates/pending_db_world/rev_1687028319280087800.sql
+++ b/data/sql/updates/db_world/2023_07_08_08.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_08_07 -> 2023_07_08_08
 --
 DELETE FROM `smart_scripts` WHERE `entryorguid` = 4126 AND `source_type` = 0 AND `id` = 0;
 DELETE FROM `creature_template_addon` WHERE `entry` = 4126;

From 02f44539c0845c71e0a7b6d8f157d1ba9991f391 Mon Sep 17 00:00:00 2001
From: Grimgravy <sr.alansantos@hotmail.com>
Date: Sat, 8 Jul 2023 20:11:14 -0300
Subject: [PATCH 17/46] fix(DB/Quest): It's a Fel Reaver, But with Heart
 (#16472)

* fix(DB/Quest): It's a Fel Reaver, But with Heart

Co-Authored-by: Gargarensis <https://github.com/Gargarensis>
---
 .../rev_1685912891682130400.sql               | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1685912891682130400.sql

diff --git a/data/sql/updates/pending_db_world/rev_1685912891682130400.sql b/data/sql/updates/pending_db_world/rev_1685912891682130400.sql
new file mode 100644
index 000000000..d26a1b12c
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1685912891682130400.sql
@@ -0,0 +1,20 @@
+--
+-- Creature entry 20287, Zaxxis Ambusher
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 20287;
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20287);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(20287, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 85, 0, 0, 0, 0, 0, 0, 0, 'Zaxxis Ambusher - On Just Summoned - Start Attacking');
+
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 17) AND (`SourceGroup` = 0) AND (`SourceEntry` = 35282) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 29) AND (`ConditionTarget` = 0) AND (`ConditionValue1` = 20243) AND (`ConditionValue2` = 13) AND (`ConditionValue3` = 0);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17, 0, 35282, 0, 0, 29, 0, 20243, 13, 0, 0, 0, 0, '', 'Shocks the Scrapped Fel Reaver\'s heart into a state that it can be salvaged.');
+
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 20243) AND (`source_type` = 0) AND (`id` IN (4, 5, 6, 7, 8, 9));
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(20243, 0, 4, 0, 0, 0, 100, 0, 2000, 2000, 30000, 30000, 0, 12, 20287, 2, 180000, 1, 0, 0, 8, 0, 0, 0, 0, 2587.87, 3952.51, 136.37, 2.38, 'Scrapped Fel Reaver - In Combat - Summon Creature \'Zaxxis Ambusher\''),
+(20243, 0, 5, 0, 0, 0, 100, 0, 17000, 17000, 45000, 45000, 0, 12, 20287, 2, 180000, 1, 0, 0, 8, 0, 0, 0, 0, 2535.75, 3922.99, 135.58, 1.81, 'Scrapped Fel Reaver - In Combat - Summon Creature \'Zaxxis Ambusher\''),
+(20243, 0, 6, 0, 0, 0, 100, 0, 32000, 32000, 45000, 45000, 0, 12, 20287, 2, 180000, 1, 0, 0, 8, 0, 0, 0, 0, 2506.46, 4008.93, 133.8, 6.19, 'Scrapped Fel Reaver - In Combat - Summon Creature \'Zaxxis Ambusher\''),
+(20243, 0, 7, 0, 0, 0, 100, 0, 60000, 60000, 45000, 45000, 0, 12, 20287, 2, 180000, 1, 0, 0, 8, 0, 0, 0, 0, 2537.3, 4027.11, 135.5, 4.3, 'Scrapped Fel Reaver - In Combat - Summon Creature \'Zaxxis Ambusher\''),
+(20243, 0, 8, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 51, 0, 0, 0, 0, 0, 0, 9, 20287, 0, 200, 0, 0, 0, 0, 0, 'Scrapped Fel Reaver - On Just Died - Kill Target'),
+(20243, 0, 9, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 51, 0, 0, 0, 0, 0, 0, 9, 20287, 0, 200, 0, 0, 0, 0, 0, 'Scrapped Fel Reaver - On Evade - Kill Target');

From cb392752ef484b751ae4f99acd452ae896aa433f Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sat, 8 Jul 2023 23:13:38 +0000
Subject: [PATCH 18/46] chore(DB): import pending files

Referenced commit(s): 02f44539c0845c71e0a7b6d8f157d1ba9991f391
---
 .../rev_1685912891682130400.sql => db_world/2023_07_08_09.sql}   | 1 +
 1 file changed, 1 insertion(+)
 rename data/sql/updates/{pending_db_world/rev_1685912891682130400.sql => db_world/2023_07_08_09.sql} (98%)

diff --git a/data/sql/updates/pending_db_world/rev_1685912891682130400.sql b/data/sql/updates/db_world/2023_07_08_09.sql
similarity index 98%
rename from data/sql/updates/pending_db_world/rev_1685912891682130400.sql
rename to data/sql/updates/db_world/2023_07_08_09.sql
index d26a1b12c..5f24f099e 100644
--- a/data/sql/updates/pending_db_world/rev_1685912891682130400.sql
+++ b/data/sql/updates/db_world/2023_07_08_09.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_08_08 -> 2023_07_08_09
 --
 -- Creature entry 20287, Zaxxis Ambusher
 UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 20287;

From f5d024629261b019d654ba1e499f322aa06f73d5 Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Sat, 8 Jul 2023 21:45:06 -0300
Subject: [PATCH 19/46] feat(Core/Object): Add helper to allow removing allowed
 looters (#16709)

---
 src/server/game/Entities/Object/Object.cpp | 5 +++++
 src/server/game/Entities/Object/Object.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index a4b218b36..fef69d6ef 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -3167,3 +3167,8 @@ GuidUnorderedSet const& WorldObject::GetAllowedLooters() const
 {
     return _allowedLooters;
 }
+
+void WorldObject::RemoveAllowedLooter(ObjectGuid guid)
+{
+    _allowedLooters.erase(guid);
+}
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index ac72ba3b0..8a75f3d87 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -614,6 +614,7 @@ public:
     void SetAllowedLooters(GuidUnorderedSet const looters);
     [[nodiscard]] bool HasAllowedLooter(ObjectGuid guid) const;
     [[nodiscard]] GuidUnorderedSet const& GetAllowedLooters() const;
+    void RemoveAllowedLooter(ObjectGuid guid);
 
     std::string GetDebugInfo() const override;
 

From fd474c8b40174dd52459fc5f53a199de52bb6e8a Mon Sep 17 00:00:00 2001
From: Dan <83884799+elthehablo@users.noreply.github.com>
Date: Sun, 9 Jul 2023 06:39:19 +0200
Subject: [PATCH 20/46] fix(Scripts/HellfireRamparts): Nazan and Vazruden
 properly reset (#16694)

* initial

dumb mistake made by me. probably fixed now

* Update boss_vazruden_the_herald.cpp

dumdum
---
 .../HellfireRamparts/boss_vazruden_the_herald.cpp              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 025fc4fbb..9683d04dc 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -66,7 +66,7 @@ struct boss_vazruden_the_herald : public BossAI
 
     void Reset() override
     {
-        BossAI::Reset();
+        _Reset();
         me->SetVisible(true);
         me->SetReactState(REACT_PASSIVE);
         me->SummonCreature(NPC_HELLFIRE_SENTRY, -1372.56f, 1724.31f, 82.967f, 5.3058f);
@@ -253,6 +253,7 @@ struct boss_vazruden : public ScriptedAI
 
     void Reset() override
     {
+        _scheduler.CancelAll();
         _nazanCalled = false;
     }
 

From 1673915f96a3a70cd8558b800512ed787064495a Mon Sep 17 00:00:00 2001
From: Eddy Vega <61223313+Si1ker@users.noreply.github.com>
Date: Sat, 8 Jul 2023 22:40:46 -0600
Subject: [PATCH 21/46] fix(Scripts/HellfirePeninsula): Improve Wounded Blood
 Elf Pilgrim (#16566)

init
---
 .../scripts/Outland/zone_hellfire_peninsula.cpp       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index effc40527..76d65a417 100644
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -234,7 +234,8 @@ enum WoundedBloodElf
     SAY_ELF_AGGRO               = 5,
     QUEST_ROAD_TO_FALCON_WATCH  = 9375,
     NPC_HAALESHI_WINDWALKER     = 16966,
-    NPC_HAALESHI_TALONGUARD     = 16967
+    NPC_HAALESHI_TALONGUARD     = 16967,
+    ARAKKOA_CAGE                = 181664
 };
 
 class npc_wounded_blood_elf : public CreatureScript
@@ -246,7 +247,11 @@ public:
     {
         npc_wounded_blood_elfAI(Creature* creature) : npc_escortAI(creature) { }
 
-        void Reset() override { }
+        void Reset() override
+        {
+            me->SetReactState(REACT_PASSIVE);
+            me->FindNearestGameObject(ARAKKOA_CAGE, 10.0f)->SetGoState(GO_STATE_READY);
+        }
 
         void JustEngagedWith(Unit* /*who*/) override
         {
@@ -263,6 +268,7 @@ public:
         {
             if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH)
             {
+                me->SetReactState(REACT_AGGRESSIVE);
                 me->SetFaction(FACTION_ESCORTEE_H_PASSIVE);
                 npc_escortAI::Start(true, false, player->GetGUID());
             }
@@ -278,6 +284,7 @@ public:
             {
                 case 0:
                     Talk(SAY_ELF_START, player);
+                    me->FindNearestGameObject(ARAKKOA_CAGE, 10.0f)->SetGoState(GO_STATE_ACTIVE);
                     break;
                 case 9:
                     Talk(SAY_ELF_SUMMON1, player);

From fe6695095717d768e09c49066f41c0a9de1be7bd Mon Sep 17 00:00:00 2001
From: wowquester <138876396+wowquester@users.noreply.github.com>
Date: Sun, 9 Jul 2023 17:12:17 +0200
Subject: [PATCH 22/46] fix(DB/Text): Darnassus Sentinels' incorrect gossip
 texts (#16714)

* Create fix4262gossip.sql

This is the fix for Darnassus Sentinels' incorrect gossip texts.

* Update fix4262gossip.sql
---
 data/sql/updates/pending_db_world/fix4262gossip.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 data/sql/updates/pending_db_world/fix4262gossip.sql

diff --git a/data/sql/updates/pending_db_world/fix4262gossip.sql b/data/sql/updates/pending_db_world/fix4262gossip.sql
new file mode 100644
index 000000000..167682104
--- /dev/null
+++ b/data/sql/updates/pending_db_world/fix4262gossip.sql
@@ -0,0 +1 @@
+UPDATE `npc_text` SET `BroadcastTextID0` = 0 WHERE `ID` = 15906 AND `BroadcastTextID0` = 40591; -- Unlink incorrect broadcast text

From 1d889220c6c18d28fb5cae4cc8a2dbc82ecf28a6 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sun, 9 Jul 2023 15:14:32 +0000
Subject: [PATCH 23/46] chore(DB): import pending files

Referenced commit(s): fe6695095717d768e09c49066f41c0a9de1be7bd
---
 .../fix4262gossip.sql => db_world/2023_07_09_00.sql}             | 1 +
 1 file changed, 1 insertion(+)
 rename data/sql/updates/{pending_db_world/fix4262gossip.sql => db_world/2023_07_09_00.sql} (74%)

diff --git a/data/sql/updates/pending_db_world/fix4262gossip.sql b/data/sql/updates/db_world/2023_07_09_00.sql
similarity index 74%
rename from data/sql/updates/pending_db_world/fix4262gossip.sql
rename to data/sql/updates/db_world/2023_07_09_00.sql
index 167682104..a4a39fae6 100644
--- a/data/sql/updates/pending_db_world/fix4262gossip.sql
+++ b/data/sql/updates/db_world/2023_07_09_00.sql
@@ -1 +1,2 @@
+-- DB update 2023_07_08_09 -> 2023_07_09_00
 UPDATE `npc_text` SET `BroadcastTextID0` = 0 WHERE `ID` = 15906 AND `BroadcastTextID0` = 40591; -- Unlink incorrect broadcast text

From 772f5cfe171baac642dc86998dd828a8eed37921 Mon Sep 17 00:00:00 2001
From: wowquester <138876396+wowquester@users.noreply.github.com>
Date: Sun, 9 Jul 2023 18:49:10 +0200
Subject: [PATCH 24/46] fix(DB/Text): 7998 - Blastmaster emi shortfuse dialogue
 issues (#16715)

* fixtext7998
---
 data/sql/updates/pending_db_world/fixtext7998v2.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/fixtext7998v2.sql

diff --git a/data/sql/updates/pending_db_world/fixtext7998v2.sql b/data/sql/updates/pending_db_world/fixtext7998v2.sql
new file mode 100644
index 000000000..6ce155e18
--- /dev/null
+++ b/data/sql/updates/pending_db_world/fixtext7998v2.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_text` SET `Text` = 'FIRE IN THE HOLE!', `Type` = 14, `BroadcastTextId` = 32326 WHERE (`CreatureID` = 7998) AND (`GroupID` = 19) AND (`ID` = 0);
+UPDATE `creature_text` SET `BroadcastTextId` = 4446 WHERE `CreatureID` = 7998 AND `GroupID` = 20 AND `ID` = 0;

From 5cae59e3943b7a5f75ab90a6d3c17b63990e8c30 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Sun, 9 Jul 2023 16:51:30 +0000
Subject: [PATCH 25/46] chore(DB): import pending files

Referenced commit(s): 772f5cfe171baac642dc86998dd828a8eed37921
---
 .../fixtext7998v2.sql => db_world/2023_07_09_01.sql}             | 1 +
 1 file changed, 1 insertion(+)
 rename data/sql/updates/{pending_db_world/fixtext7998v2.sql => db_world/2023_07_09_01.sql} (86%)

diff --git a/data/sql/updates/pending_db_world/fixtext7998v2.sql b/data/sql/updates/db_world/2023_07_09_01.sql
similarity index 86%
rename from data/sql/updates/pending_db_world/fixtext7998v2.sql
rename to data/sql/updates/db_world/2023_07_09_01.sql
index 6ce155e18..274f7657e 100644
--- a/data/sql/updates/pending_db_world/fixtext7998v2.sql
+++ b/data/sql/updates/db_world/2023_07_09_01.sql
@@ -1,2 +1,3 @@
+-- DB update 2023_07_09_00 -> 2023_07_09_01
 UPDATE `creature_text` SET `Text` = 'FIRE IN THE HOLE!', `Type` = 14, `BroadcastTextId` = 32326 WHERE (`CreatureID` = 7998) AND (`GroupID` = 19) AND (`ID` = 0);
 UPDATE `creature_text` SET `BroadcastTextId` = 4446 WHERE `CreatureID` = 7998 AND `GroupID` = 20 AND `ID` = 0;

From e29429462c3db84a41a1cb7328ecb6e068724012 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Mon, 10 Jul 2023 05:59:55 -0300
Subject: [PATCH 26/46] chore(Scripts/MagtheridonsLair): Adjust Magtheridon's
 timers (#16723)

Update boss_magtheridon.cpp
---
 .../HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index 077dbd977..af6283e0b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -177,11 +177,11 @@ public:
                 scheduler.Schedule(9s, [this](TaskContext context)
                 {
                     DoCastVictim(SPELL_CLEAVE);
-                    context.Repeat(10s);
-                }).Schedule(10s, [this](TaskContext context)
+                    context.Repeat(1200ms, 16300ms);
+                }).Schedule(20s, [this](TaskContext context)
                 {
                     me->CastCustomSpell(SPELL_BLAZE, SPELLVALUE_MAX_TARGETS, 1);
-                    context.Repeat(30s);
+                    context.Repeat(11s, 39s);
                 }).Schedule(40s, [this](TaskContext context)
                 {
                     me->CastSpell(me, SPELL_QUAKE); //needs fixes with custom spell
@@ -203,7 +203,7 @@ public:
                             scheduler.CancelGroup(GROUP_INTERRUPT_CHECK);
                         });
                     });
-                    context.Repeat(50s);
+                    context.Repeat(53s, 56s);
                 }).Schedule(1320s, [this](TaskContext /*context*/)
                 {
                     DoCastSelf(SPELL_BERSERK, true);

From 5850079ae8d18791ea1dd6e4c87038b4021e5445 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Mon, 10 Jul 2023 06:00:23 -0300
Subject: [PATCH 27/46] fix(DB/Creature): Link Hellfire Channelers in
 Magtheridon's Lair (#16721)

* Create rev_1688928918454010300.sql

* Update rev_1688928918454010300.sql

* Update rev_1688928918454010300.sql
---
 .../updates/pending_db_world/rev_1688928918454010300.sql  | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1688928918454010300.sql

diff --git a/data/sql/updates/pending_db_world/rev_1688928918454010300.sql b/data/sql/updates/pending_db_world/rev_1688928918454010300.sql
new file mode 100644
index 000000000..92a23abfa
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1688928918454010300.sql
@@ -0,0 +1,8 @@
+--
+DELETE FROM `creature_formations` WHERE `memberGUID` IN (90978, 90979, 90980, 90981, 90982);
+INSERT INTO `creature_formations` (`memberGUID`, `leaderGUID`, `groupAI`) VALUES
+(90978, 90978, 3),
+(90979, 90978, 3),
+(90980, 90978, 3),
+(90981, 90978, 3),
+(90982, 90978, 3);

From fd169fbd6b149f460519624ae2e432020c326ca6 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Mon, 10 Jul 2023 06:01:21 -0300
Subject: [PATCH 28/46] fix(DB/SAI): Adjust Spell Timers for Magtheridon's Lair
 adds (#16722)

Create rev_1688929936108072000.sql
---
 .../rev_1688929936108072000.sql               | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1688929936108072000.sql

diff --git a/data/sql/updates/pending_db_world/rev_1688929936108072000.sql b/data/sql/updates/pending_db_world/rev_1688929936108072000.sql
new file mode 100644
index 000000000..265b13e96
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1688929936108072000.sql
@@ -0,0 +1,21 @@
+--
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 17256);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(17256, 0, 0, 0, 0, 0, 100, 0, 20900, 28200, 12100, 19400, 0, 11, 30510, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Channeler - In Combat - Cast \'Shadow Bolt Volley\''),
+(17256, 0, 1, 0, 74, 0, 100, 0, 0, 50, 14500, 15000, 30, 11, 30528, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Channeler - On Friendly Between 0-50% Health - Cast \'Dark Mending\''),
+(17256, 0, 2, 0, 0, 0, 100, 0, 6000, 12000, 17000, 28000, 0, 11, 30530, 0, 0, 0, 0, 0, 6, 30, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Channeler - In Combat - Cast \'Fear\''),
+(17256, 0, 3, 0, 0, 0, 100, 0, 19650, 63350, 60000, 60000, 0, 11, 30511, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Channeler - In Combat - Cast \'Burning Abyssal\''),
+(17256, 0, 4, 0, 1, 0, 100, 0, 3600, 3600, 3600, 3600, 0, 11, 30207, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Channeler - Out of Combat - Cast \'Shadow Grasp\''),
+(17256, 0, 5, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 11, 30531, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Channeler - On Just Died - Cast \'Soul Transfer\''),
+(17256, 0, 6, 0, 4, 0, 100, 512, 0, 0, 0, 0, 0, 34, 10, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Channeler - On Aggro - Set Instance Data 10 to 1'),
+(17256, 0, 7, 0, 25, 0, 100, 512, 0, 0, 0, 0, 0, 8, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Channeler - On Reset - Set Reactstate Defensive');
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 18829);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(18829, 0, 0, 0, 0, 0, 100, 0, 10050, 26400, 13350, 23100, 0, 11, 39175, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Warder - In Combat - Cast \'Shadow Bolt Volley\''),
+(18829, 0, 1, 0, 0, 0, 100, 0, 10600, 16100, 12100, 26700, 0, 11, 34437, 0, 0, 0, 0, 0, 5, 30, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Warder - In Combat - Cast \'Death Coil\''),
+(18829, 0, 2, 0, 0, 0, 100, 0, 8200, 8800, 12150, 19450, 0, 11, 34435, 0, 0, 0, 0, 0, 5, 40, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Warder - In Combat - Cast \'Rain of Fire\''),
+(18829, 0, 3, 0, 0, 0, 100, 0, 8200, 8800, 18200, 30350, 0, 11, 34436, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Warder - In Combat - Cast \'Shadow Burst\''),
+(18829, 0, 4, 0, 0, 0, 100, 0, 19750, 25200, 8500, 18200, 0, 11, 34439, 32, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Warder - In Combat - Cast \'Unstable Affliction\''),
+(18829, 0, 5, 0, 0, 0, 100, 0, 10600, 16100, 26700, 29100, 0, 11, 34441, 32, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Warder - In Combat - Cast \'Shadow Word: Pain\''),
+(18829, 0, 6, 0, 31, 0, 100, 512, 34439, 0, 0, 0, 0, 13, 0, 100, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Hellfire Warder - On Target Spellhit \'Unstable Affliction\' - Reset Threat');

From 65d6baeb4a74996b996473e9094f1b824ae9cb2e Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Mon, 10 Jul 2023 06:02:30 -0300
Subject: [PATCH 29/46] fix(DB/SAI): Claw shouldn't be killable (#16713)

Create rev_1688909297506226100.sql
---
 .../rev_1688909297506226100.sql               | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1688909297506226100.sql

diff --git a/data/sql/updates/pending_db_world/rev_1688909297506226100.sql b/data/sql/updates/pending_db_world/rev_1688909297506226100.sql
new file mode 100644
index 000000000..d7f78657f
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1688909297506226100.sql
@@ -0,0 +1,26 @@
+--
+DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 1782700);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(1782700, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - Actionlist - Remove All Aura'),
+(1782700, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - Actionlist - Set Run On'),
+(1782700, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 289.255, -129.7, 29.821, 2.49582, 'Claw - Actionlist - Move To Position'),
+(1782700, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 2, 1660, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - Actionlist - Set Faction 1660'),
+(1782700, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 18, 525072, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - Actionlist - Set Flags Rename & Immune To Players & Immune To NPC\'s & In Combat'),
+(1782700, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 3, 0, 2289, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - Actionlist - Morph To Model 2289'),
+(1782700, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - Actionlist - Set Npc Flag '),
+(1782700, 9, 7, 0, 0, 0, 100, 0, 4000, 4000, 4000, 4000, 0, 69, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 290.532, -125.352, 29.6971, 1.82491, 'Claw - Actionlist - Move To Position'),
+(1782700, 9, 8, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 3, 17894, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - Actionlist - Morph To Creature Windcaller Claw'),
+(1782700, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 18, 557824, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - Actionlist - Set Flags Immune To Players & Immune To NPC\'s & In Combat'),
+(1782700, 9, 10, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 90, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - Actionlist - Set Flag Standstate Sit Down'),
+(1782700, 9, 11, 0, 0, 0, 100, 0, 500, 500, 500, 500, 0, 81, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - Actionlist - Set Npc Flags Gossip');
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 17827);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(17827, 0, 0, 0, 0, 0, 100, 0, 7400, 7400, 20000, 20000, 0, 11, 39435, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - In Combat - Cast \'Feral Charge\''),
+(17827, 0, 1, 0, 0, 0, 100, 0, 2400, 2400, 10600, 21200, 0, 11, 31429, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - In Combat - Cast \'Echoing Roar\''),
+(17827, 0, 2, 6, 0, 0, 100, 0, 5000, 5000, 30500, 30500, 0, 11, 34971, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - In Combat - Cast \'Frenzy\''),
+(17827, 0, 3, 0, 0, 0, 100, 0, 5300, 5300, 11100, 21500, 0, 11, 34298, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - In Combat - Cast \'Maul\''),
+(17827, 0, 4, 0, 2, 0, 100, 769, 0, 20, 0, 0, 0, 80, 1782700, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - Between 0-20% Health - Run Script'),
+(17827, 0, 5, 0, 64, 0, 100, 512, 0, 0, 0, 0, 0, 33, 17894, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - On Gossip Hello - Quest Credit \'Lost In Action\''),
+(17827, 0, 6, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 17826, 100, 0, 0, 0, 0, 0, 0, 'Claw - In Combat - Say Line 0'),
+(17827, 0, 7, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Claw - On Reset - Set Invincibility Hp 1');

From a3193a03d716460a1590cb48fc234f3ace6b1df0 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Mon, 10 Jul 2023 09:04:55 +0000
Subject: [PATCH 30/46] chore(DB): import pending files

Referenced commit(s): 65d6baeb4a74996b996473e9094f1b824ae9cb2e
---
 .../rev_1688909297506226100.sql => db_world/2023_07_10_00.sql}   | 1 +
 .../rev_1688928918454010300.sql => db_world/2023_07_10_01.sql}   | 1 +
 .../rev_1688929936108072000.sql => db_world/2023_07_10_02.sql}   | 1 +
 3 files changed, 3 insertions(+)
 rename data/sql/updates/{pending_db_world/rev_1688909297506226100.sql => db_world/2023_07_10_00.sql} (98%)
 rename data/sql/updates/{pending_db_world/rev_1688928918454010300.sql => db_world/2023_07_10_01.sql} (86%)
 rename data/sql/updates/{pending_db_world/rev_1688929936108072000.sql => db_world/2023_07_10_02.sql} (98%)

diff --git a/data/sql/updates/pending_db_world/rev_1688909297506226100.sql b/data/sql/updates/db_world/2023_07_10_00.sql
similarity index 98%
rename from data/sql/updates/pending_db_world/rev_1688909297506226100.sql
rename to data/sql/updates/db_world/2023_07_10_00.sql
index d7f78657f..3dace1d24 100644
--- a/data/sql/updates/pending_db_world/rev_1688909297506226100.sql
+++ b/data/sql/updates/db_world/2023_07_10_00.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_09_01 -> 2023_07_10_00
 --
 DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 1782700);
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
diff --git a/data/sql/updates/pending_db_world/rev_1688928918454010300.sql b/data/sql/updates/db_world/2023_07_10_01.sql
similarity index 86%
rename from data/sql/updates/pending_db_world/rev_1688928918454010300.sql
rename to data/sql/updates/db_world/2023_07_10_01.sql
index 92a23abfa..b27b48971 100644
--- a/data/sql/updates/pending_db_world/rev_1688928918454010300.sql
+++ b/data/sql/updates/db_world/2023_07_10_01.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_10_00 -> 2023_07_10_01
 --
 DELETE FROM `creature_formations` WHERE `memberGUID` IN (90978, 90979, 90980, 90981, 90982);
 INSERT INTO `creature_formations` (`memberGUID`, `leaderGUID`, `groupAI`) VALUES
diff --git a/data/sql/updates/pending_db_world/rev_1688929936108072000.sql b/data/sql/updates/db_world/2023_07_10_02.sql
similarity index 98%
rename from data/sql/updates/pending_db_world/rev_1688929936108072000.sql
rename to data/sql/updates/db_world/2023_07_10_02.sql
index 265b13e96..f0333ca11 100644
--- a/data/sql/updates/pending_db_world/rev_1688929936108072000.sql
+++ b/data/sql/updates/db_world/2023_07_10_02.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_10_01 -> 2023_07_10_02
 --
 DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 17256);
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES

From 221f1414e9dc1837cc8408a22892ce8acd8a8358 Mon Sep 17 00:00:00 2001
From: Angelo Venturini <nefertum.dev@protonmail.com>
Date: Mon, 10 Jul 2023 19:16:49 -0300
Subject: [PATCH 31/46] fix(DB/Creature): Burning Abyssal immune mask (#16731)

---
 data/sql/updates/pending_db_world/rev_1689021460555110200.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1689021460555110200.sql

diff --git a/data/sql/updates/pending_db_world/rev_1689021460555110200.sql b/data/sql/updates/pending_db_world/rev_1689021460555110200.sql
new file mode 100644
index 000000000..36f8c2b41
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1689021460555110200.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`&~(64|2048|536870912) WHERE `entry` = 17454;

From abf1b3a89a8c267baf74ae1f32c0c3a154acfdb0 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Mon, 10 Jul 2023 22:19:08 +0000
Subject: [PATCH 32/46] chore(DB): import pending files

Referenced commit(s): 221f1414e9dc1837cc8408a22892ce8acd8a8358
---
 .../rev_1689021460555110200.sql => db_world/2023_07_10_03.sql}   | 1 +
 1 file changed, 1 insertion(+)
 rename data/sql/updates/{pending_db_world/rev_1689021460555110200.sql => db_world/2023_07_10_03.sql} (74%)

diff --git a/data/sql/updates/pending_db_world/rev_1689021460555110200.sql b/data/sql/updates/db_world/2023_07_10_03.sql
similarity index 74%
rename from data/sql/updates/pending_db_world/rev_1689021460555110200.sql
rename to data/sql/updates/db_world/2023_07_10_03.sql
index 36f8c2b41..54929900b 100644
--- a/data/sql/updates/pending_db_world/rev_1689021460555110200.sql
+++ b/data/sql/updates/db_world/2023_07_10_03.sql
@@ -1,2 +1,3 @@
+-- DB update 2023_07_10_02 -> 2023_07_10_03
 --
 UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`&~(64|2048|536870912) WHERE `entry` = 17454;

From 09541e3bd706cc875dfe329301ece7e0a27a5307 Mon Sep 17 00:00:00 2001
From: Angelo Venturini <nefertum.dev@protonmail.com>
Date: Mon, 10 Jul 2023 22:34:34 -0300
Subject: [PATCH 33/46] fix(Scripts/MagtheridonsLair): fix Magtheridon's Quake
 spell (#16730)

* fix(Core/Magtheridon): fix Magtheridon's Quake spell

* missing sql
---
 .../rev_1689020767712933600.sql               |   5 +
 .../MagtheridonsLair/boss_magtheridon.cpp     | 364 +++++++++---------
 .../MagtheridonsLair/magtheridons_lair.h      |   2 +
 3 files changed, 182 insertions(+), 189 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1689020767712933600.sql

diff --git a/data/sql/updates/pending_db_world/rev_1689020767712933600.sql b/data/sql/updates/pending_db_world/rev_1689020767712933600.sql
new file mode 100644
index 000000000..8e02a0ef0
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1689020767712933600.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 30658 AND `spell_effect` = 30571;
+DELETE FROM `spell_script_names` WHERE `ScriptName` = ('spell_magtheridon_quake');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(30658, 'spell_magtheridon_quake');
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index af6283e0b..43a25f4b0 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -49,6 +49,7 @@ enum Spells
     SPELL_SHADOW_GRASP_VISUAL   = 30166,
     SPELL_MIND_EXHAUSTION       = 44032,
     SPELL_QUAKE                 = 30657,
+    SPELL_QUAKE_KNOCKBACK       = 30571,
     SPELL_COLLAPSE_DAMAGE       = 36449,
     SPELL_CAMERA_SHAKE          = 36455,
     SPELL_DEBRIS_VISUAL         = 30632,
@@ -77,232 +78,217 @@ private:
     ObjectGuid _targetGUID;
 };
 
-class boss_magtheridon : public CreatureScript
+struct boss_magtheridon : public BossAI
 {
-public:
-    boss_magtheridon() : CreatureScript("boss_magtheridon") { }
-
-    struct boss_magtheridonAI : public BossAI
+    boss_magtheridon(Creature* creature) : BossAI(creature, TYPE_MAGTHERIDON)
     {
-        boss_magtheridonAI(Creature* creature) : BossAI(creature, TYPE_MAGTHERIDON)
+        scheduler.SetValidator([this]
         {
-            scheduler.SetValidator([this]
+            return !me->HasUnitState(UNIT_STATE_CASTING);
+        });
+    }
+
+    void Reset() override
+    {
+        BossAI::Reset();
+        _currentPhase = 0;
+        _recentlySpoken = false;
+        scheduler.Schedule(90s, [this](TaskContext context)
+        {
+            Talk(SAY_TAUNT);
+            context.Repeat(90s);
+        });
+        DoCastSelf(SPELL_SHADOW_CAGE, true);
+        me->SetReactState(REACT_PASSIVE);
+        me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
+        me->SetImmuneToPC(true);
+
+        ScheduleHealthCheckEvent(30, [&]
+        {
+            _currentPhase = 1;
+            Talk(SAY_PHASE3);
+            me->GetMotionMaster()->Clear();
+            scheduler.DelayAll(18s);
+            scheduler.Schedule(8s, [this](TaskContext /*context*/)
             {
-                return !me->HasUnitState(UNIT_STATE_CASTING);
+                DoCastSelf(SPELL_CAMERA_SHAKE, true);
+                instance->SetData(DATA_COLLAPSE, GO_STATE_ACTIVE);
+            }).Schedule(15s, [this](TaskContext /*context*/)
+            {
+                DoCastSelf(SPELL_COLLAPSE_DAMAGE, true);
+                me->resetAttackTimer();
+                me->GetMotionMaster()->MoveChase(me->GetVictim());
+                _currentPhase = 0;
+                scheduler.Schedule(20s, [this](TaskContext context)
+                {
+                    if (Unit* target = SelectTarget(SelectTargetMethod::Random))
+                    {
+                        target->CastSpell(target, SPELL_DEBRIS_VISUAL, true, nullptr, nullptr, me->GetGUID());
+                        me->m_Events.AddEvent(new DealDebrisDamage(*me, target->GetGUID()), me->m_Events.CalculateTime(5000));
+                    }
+                    context.Repeat(20s);
+                });
             });
+        });
+    }
+
+    void KilledUnit(Unit* /*victim*/) override
+    {
+        if (!_recentlySpoken)
+        {
+            Talk(SAY_SLAY);
+            _recentlySpoken = true;
         }
 
-        void Reset() override
+        scheduler.Schedule(5s, [this](TaskContext /*context*/)
         {
-            _Reset();
-            _currentPhase = 0;
             _recentlySpoken = false;
-            scheduler.Schedule(90s, [this](TaskContext context)
-            {
-                Talk(SAY_TAUNT);
-                context.Repeat(90s);
-            });
-            me->CastSpell(me, SPELL_SHADOW_CAGE, true);
-            me->SetReactState(REACT_PASSIVE);
-            me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
-            me->SetImmuneToPC(true);
+        });
+    }
 
-            ScheduleHealthCheckEvent(30, [&] {
-                _currentPhase = 1;
-                Talk(SAY_PHASE3);
-                me->GetMotionMaster()->Clear();
-                scheduler.DelayAll(18s);
-                scheduler.Schedule(8s, [this](TaskContext /*context*/)
+    void JustDied(Unit* killer) override
+    {
+        Talk(SAY_DEATH);
+        BossAI::JustDied(killer);
+    }
+
+    void JustEngagedWith(Unit* who) override
+    {
+        BossAI::JustEngagedWith(who);
+        Talk(SAY_EMOTE_BEGIN);
+
+        scheduler.Schedule(60s, [this](TaskContext /*context*/)
+        {
+            Talk(SAY_EMOTE_NEARLY);
+        }).Schedule(120s, [this](TaskContext /*context*/)
+        {
+            Talk(SAY_EMOTE_FREE);
+        }).Schedule(123s, [this](TaskContext /*context*/)
+        {
+            me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
+            me->SetImmuneToPC(false);
+            me->SetReactState(REACT_AGGRESSIVE);
+            instance->SetData(DATA_ACTIVATE_CUBES, 1);
+            me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE);
+
+            scheduler.Schedule(9s, [this](TaskContext context)
+            {
+                DoCastVictim(SPELL_CLEAVE);
+                context.Repeat(1200ms, 16300ms);
+            }).Schedule(20s, [this](TaskContext context)
+            {
+                me->CastCustomSpell(SPELL_BLAZE, SPELLVALUE_MAX_TARGETS, 1);
+                context.Repeat(11s, 39s);
+            }).Schedule(40s, [this](TaskContext context)
+            {
+                DoCastSelf(SPELL_QUAKE); //needs fixes with custom spell
+                scheduler.Schedule(7s, [this](TaskContext /*context*/)
                 {
-                    DoCastSelf(SPELL_CAMERA_SHAKE, true);
-                    instance->SetData(DATA_COLLAPSE, GO_STATE_ACTIVE);
-                }).Schedule(15s, [this](TaskContext /*context*/)
-                {
-                    DoCastSelf(SPELL_COLLAPSE_DAMAGE, true);
-                    me->resetAttackTimer();
-                    me->GetMotionMaster()->MoveChase(me->GetVictim());
-                    _currentPhase = 0;
-                    scheduler.Schedule(20s, [this](TaskContext context)
+                    DoCastSelf(SPELL_BLAST_NOVA);
+
+                    scheduler.Schedule(50ms, GROUP_INTERRUPT_CHECK, [this](TaskContext context)
                     {
-                        if (Unit* target = SelectTarget(SelectTargetMethod::Random))
-                        {
-                            target->CastSpell(target, SPELL_DEBRIS_VISUAL, true, nullptr, nullptr, me->GetGUID());
-                            me->m_Events.AddEvent(new DealDebrisDamage(*me, target->GetGUID()), me->m_Events.CalculateTime(5000));
-                        }
-                        context.Repeat(20s);
-                    });
-                });
-            });
-        }
-
-        void KilledUnit(Unit* /*victim*/) override
-        {
-            if(!_recentlySpoken)
-            {
-                Talk(SAY_SLAY);
-                _recentlySpoken = true;
-            }
-
-            scheduler.Schedule(5s, [this](TaskContext /*context*/)
-            {
-                _recentlySpoken = false;
-            });
-        }
-
-        void JustDied(Unit* /*killer*/) override
-        {
-            _JustDied();
-            Talk(SAY_DEATH);
-        }
-
-        void JustEngagedWith(Unit* /*who*/) override
-        {
-            _JustEngagedWith();
-            Talk(SAY_EMOTE_BEGIN);
-
-            scheduler.Schedule(60s, [this](TaskContext /*context*/)
-            {
-                Talk(SAY_EMOTE_NEARLY);
-            }).Schedule(120s, [this](TaskContext /*context*/)
-            {
-                Talk(SAY_EMOTE_FREE);
-            }).Schedule(123s, [this](TaskContext /*context*/)
-            {
-                me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
-                me->SetImmuneToPC(false);
-                me->SetReactState(REACT_AGGRESSIVE);
-                instance->SetData(DATA_ACTIVATE_CUBES, 1);
-                me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE);
-
-                scheduler.Schedule(9s, [this](TaskContext context)
-                {
-                    DoCastVictim(SPELL_CLEAVE);
-                    context.Repeat(1200ms, 16300ms);
-                }).Schedule(20s, [this](TaskContext context)
-                {
-                    me->CastCustomSpell(SPELL_BLAZE, SPELLVALUE_MAX_TARGETS, 1);
-                    context.Repeat(11s, 39s);
-                }).Schedule(40s, [this](TaskContext context)
-                {
-                    me->CastSpell(me, SPELL_QUAKE); //needs fixes with custom spell
-                    scheduler.Schedule(7s, [this](TaskContext /*context*/)
-                    {
-                        DoCastSelf(SPELL_BLAST_NOVA);
-
-                        scheduler.Schedule(50ms, GROUP_INTERRUPT_CHECK, [this](TaskContext context)
-                        {
-                            if (me->GetAuraCount(SPELL_SHADOW_GRASP_VISUAL) == 5)
-                            {
-                                Talk(SAY_BANISH);
-                                me->InterruptNonMeleeSpells(true);
-                                scheduler.CancelGroup(GROUP_INTERRUPT_CHECK);
-                            }
-                            context.Repeat(50ms);
-                        }).Schedule(12s, GROUP_INTERRUPT_CHECK, [this](TaskContext /*context*/)
+                        if (me->GetAuraCount(SPELL_SHADOW_GRASP_VISUAL) == 5)
                         {
+                            Talk(SAY_BANISH);
+                            me->InterruptNonMeleeSpells(true);
                             scheduler.CancelGroup(GROUP_INTERRUPT_CHECK);
-                        });
+                        }
+                        context.Repeat(50ms);
+                    }).Schedule(12s, GROUP_INTERRUPT_CHECK, [this](TaskContext /*context*/)
+                    {
+                        scheduler.CancelGroup(GROUP_INTERRUPT_CHECK);
                     });
-                    context.Repeat(53s, 56s);
-                }).Schedule(1320s, [this](TaskContext /*context*/)
-                {
-                    DoCastSelf(SPELL_BERSERK, true);
                 });
-            });
-        }
-
-        void UpdateAI(uint32 diff) override
-        {
-            if (!UpdateVictim())
-                return;
-
-            scheduler.Update(diff);
-
-            if (_currentPhase != 1)
+                context.Repeat(53s, 56s);
+            }).Schedule(1320s, [this](TaskContext /*context*/)
             {
-                DoMeleeAttackIfReady();
-            }
-        }
-    private:
-        bool _recentlySpoken;
-        uint8 _currentPhase;
-    };
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetMagtheridonsLairAI<boss_magtheridonAI>(creature);
+                DoCastSelf(SPELL_BERSERK, true);
+            });
+        });
     }
 
+    void UpdateAI(uint32 diff) override
+    {
+        if (!UpdateVictim())
+            return;
+
+        scheduler.Update(diff);
+
+        if (_currentPhase != 1)
+        {
+            DoMeleeAttackIfReady();
+        }
+    }
+
+private:
+    bool _recentlySpoken;
+    uint8 _currentPhase;
 };
 
-class spell_magtheridon_blaze : public SpellScriptLoader
+class spell_magtheridon_blaze : public SpellScript
 {
-public:
-    spell_magtheridon_blaze() : SpellScriptLoader("spell_magtheridon_blaze") { }
+    PrepareSpellScript(spell_magtheridon_blaze);
 
-    class spell_magtheridon_blaze_SpellScript : public SpellScript
+    void HandleScriptEffect(SpellEffIndex /*effIndex*/)
     {
-        PrepareSpellScript(spell_magtheridon_blaze_SpellScript);
+        if (Unit* target = GetHitUnit())
+            target->CastSpell(target, SPELL_BLAZE_SUMMON, true);
+    }
 
-        void HandleScriptEffect(SpellEffIndex /*effIndex*/)
-        {
-            if (Unit* target = GetHitUnit())
-                target->CastSpell(target, SPELL_BLAZE_SUMMON, true);
-        }
-
-        void Register() override
-        {
-            OnEffectHitTarget += SpellEffectFn(spell_magtheridon_blaze_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
-        }
-    };
-
-    SpellScript* GetSpellScript() const override
+    void Register() override
     {
-        return new spell_magtheridon_blaze_SpellScript();
+        OnEffectHitTarget += SpellEffectFn(spell_magtheridon_blaze::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
     }
 };
 
-class spell_magtheridon_shadow_grasp : public SpellScriptLoader
+class spell_magtheridon_shadow_grasp : public AuraScript
 {
-public:
-    spell_magtheridon_shadow_grasp() : SpellScriptLoader("spell_magtheridon_shadow_grasp") { }
+    PrepareAuraScript(spell_magtheridon_shadow_grasp);
 
-    class spell_magtheridon_shadow_grasp_AuraScript : public AuraScript
+    void HandleDummyApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
-        PrepareAuraScript(spell_magtheridon_shadow_grasp_AuraScript)
+        GetUnitOwner()->CastSpell((Unit*)nullptr, SPELL_SHADOW_GRASP_VISUAL, false);
+    }
 
-        void HandleDummyApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-        {
-            GetUnitOwner()->CastSpell((Unit*)nullptr, SPELL_SHADOW_GRASP_VISUAL, false);
-        }
-
-        void HandleDummyRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-        {
-            GetUnitOwner()->InterruptNonMeleeSpells(true);
-        }
-
-        void HandlePeriodicRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
-        {
-            GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_MIND_EXHAUSTION, true);
-        }
-
-        void Register() override
-        {
-            OnEffectApply += AuraEffectApplyFn(spell_magtheridon_shadow_grasp_AuraScript::HandleDummyApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
-            OnEffectRemove += AuraEffectRemoveFn(spell_magtheridon_shadow_grasp_AuraScript::HandleDummyRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
-            OnEffectRemove += AuraEffectRemoveFn(spell_magtheridon_shadow_grasp_AuraScript::HandlePeriodicRemove, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
-        }
-    };
-
-    AuraScript* GetAuraScript() const override
+    void HandleDummyRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
-        return new spell_magtheridon_shadow_grasp_AuraScript();
+        GetUnitOwner()->InterruptNonMeleeSpells(true);
+    }
+
+    void HandlePeriodicRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_MIND_EXHAUSTION, true);
+    }
+
+    void Register() override
+    {
+        OnEffectApply += AuraEffectApplyFn(spell_magtheridon_shadow_grasp::HandleDummyApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
+        OnEffectRemove += AuraEffectRemoveFn(spell_magtheridon_shadow_grasp::HandleDummyRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
+        OnEffectRemove += AuraEffectRemoveFn(spell_magtheridon_shadow_grasp::HandlePeriodicRemove, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
+    }
+};
+
+class spell_magtheridon_quake : public SpellScript
+{
+    PrepareSpellScript(spell_magtheridon_quake);
+
+    void HandleHit()
+    {
+        if (urand(0, 3) == 0)
+            GetCaster()->CastSpell(GetCaster(), SPELL_QUAKE_KNOCKBACK, true);
+    }
+
+    void Register() override
+    {
+        OnHit += SpellHitFn(spell_magtheridon_quake::HandleHit);
     }
 };
 
 void AddSC_boss_magtheridon()
 {
-    new boss_magtheridon();
-    new spell_magtheridon_blaze();
-    new spell_magtheridon_shadow_grasp();
+    RegisterMagtheridonsLairCreatureAI(boss_magtheridon);
+    RegisterSpellScript(spell_magtheridon_blaze);
+    RegisterSpellScript(spell_magtheridon_shadow_grasp);
+    RegisterSpellScript(spell_magtheridon_quake);
 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
index 9f38598fc..fe6fccf97 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
@@ -62,4 +62,6 @@ inline AI* GetMagtheridonsLairAI(T* obj)
     return GetInstanceAI<AI>(obj, MagtheridonsLairScriptName);
 }
 
+#define RegisterMagtheridonsLairCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetMagtheridonsLairAI)
+
 #endif

From fe52a5c9eb02de95a08d02e0d309c92fe50aa9e7 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Mon, 10 Jul 2023 22:35:21 -0300
Subject: [PATCH 34/46] chore(Scripts/GruulsLair): Adjust timers for
 Reverberation and Hurtful Strike (#16732)

Update boss_gruul.cpp
---
 src/server/scripts/Outland/GruulsLair/boss_gruul.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index 16eb9e89a..146080b63 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -87,11 +87,11 @@ struct boss_gruul : public BossAI
                 _caveInTimer = _caveInTimer - 1500ms;
             }
             context.Repeat(_caveInTimer);
-        }).Schedule(20s, [this](TaskContext context)
+        }).Schedule(39900ms, 55700ms, [this](TaskContext context)
         {
             DoCastSelf(SPELL_REVERBERATION);
-            context.Repeat(22s);
-        }).Schedule(10s, [this](TaskContext context)
+            context.Repeat(39900ms, 55700ms);
+        }).Schedule(5600ms, [this](TaskContext context)
         {
             if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 1, 5.0f))
             {
@@ -101,7 +101,7 @@ struct boss_gruul : public BossAI
             {
                 DoCastVictim(SPELL_HURTFUL_STRIKE);
             }
-            context.Repeat(15s);
+            context.Repeat(8400ms);
         }).Schedule(35s, [this](TaskContext context)
         {
             Talk(SAY_SLAM);

From 89959a193f5cae0e96901e3a3360cfa83d4d099e Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Mon, 10 Jul 2023 22:36:16 -0300
Subject: [PATCH 35/46] fix(DB/Loot): Correct Loot for several TBC Heroics
 (#16716)

Create rev_1688915874765152000.sql

Co-authored-by: Tereneckla <50233983+Tereneckla@users.noreply.github.com>
---
 .../rev_1688915874765152000.sql               | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1688915874765152000.sql

diff --git a/data/sql/updates/pending_db_world/rev_1688915874765152000.sql b/data/sql/updates/pending_db_world/rev_1688915874765152000.sql
new file mode 100644
index 000000000..9bbce1c11
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1688915874765152000.sql
@@ -0,0 +1,77 @@
+-- Old Hillsbrad Foothills
+UPDATE `creature_loot_template` SET `GroupID` = 7 WHERE `Entry` = 20531 AND `Item` IN (
+27904, -- Resounding Ring of Glory
+28401, -- Hauberk of Desolation
+28191, -- Mana-Etched Vestments
+28344, -- Wyrmfury Pauldrons
+27911, -- Epoch's Whispering Cinch
+28224  -- Wastewalker Helm
+);
+-- Mana-Tombs
+UPDATE `creature_loot_template` SET `GroupID` = 6 WHERE `Entry` = 20266 AND `Item` IN (
+27843, -- Glyph-Lined Sash
+27798, -- Gauntlets of Vindication
+27842, -- Grand Scepter of the Nexus-Kings
+28400, -- Warp-Storm Warblade
+27844, -- Pauldrons of Swift Retribution
+27840  -- Scepter of Shatar
+);
+-- The Underbog
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 20184) AND (`Item` = 43001) AND (`Reference` = 43001);
+DELETE FROM `reference_loot_template` WHERE (`Entry` = 43001);
+DELETE FROM `creature_loot_template` WHERE `Item` IN (27768,27769,27770,27771,27772,27773,27779,27780,27781,27896,27907,27938);
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(20184, 27768, 0, 0, 0, 1, 5, 1, 1, 'The Black Stalker (1) - Oracle Belt of Timeless Mystery'),
+(20184, 27769, 0, 0, 0, 1, 5, 1, 1, 'The Black Stalker (1) - Endbringer'),
+(20184, 27770, 0, 0, 0, 1, 5, 1, 1, 'The Black Stalker (1) - Argussian Compass'),
+(20184, 27771, 0, 0, 0, 1, 5, 1, 1, 'The Black Stalker (1) - Doomplate Shoulderguards'),
+(20184, 27772, 0, 0, 0, 1, 5, 1, 1, 'The Black Stalker (1) - Stormshield of Renewal'),
+(20184, 27773, 0, 0, 0, 1, 5, 1, 1, 'The Black Stalker (1) - Barbaric Legstraps'),
+(20184, 27779, 0, 0, 0, 1, 2, 1, 1, 'The Black Stalker (1) - Bone Chain Necklace'),
+(20184, 27780, 0, 0, 0, 1, 2, 1, 1, 'The Black Stalker (1) - Ring of Fabled Hope'),
+(20184, 27781, 0, 0, 0, 1, 2, 1, 1, 'The Black Stalker (1) - Demonfang Ritual Helm'),
+(20184, 27896, 0, 0, 0, 1, 2, 1, 1, 'The Black Stalker (1) - Alembic of Infernal Power'),
+(20184, 27907, 0, 0, 0, 1, 2, 1, 1, 'The Black Stalker (1) - Mana-Etched Pantaloons'),
+(20184, 27938, 0, 0, 0, 1, 2, 1, 1, 'The Black Stalker (1) - Savage Mask of the Lynx Lord');
+-- The Slave Pens
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 19894) AND (`Item` IN (31882, 31892, 31901, 31910));
+UPDATE `creature_loot_template` SET `GroupID` = 5 WHERE `Entry` = 19894 AND `Item` IN (
+27741, -- Bleeding Hollow Warhammer
+27742, -- Mage-Fury Girdle
+27800, -- Earthsoul Britches
+28337, -- Breastplate of Righteous Fury
+27796, -- Mana-Etched Spaulders
+27740  -- Band of Ursol
+);
+-- The Blood Furnace
+UPDATE `creature_loot_template` SET `GroupID` = 6 WHERE `Entry` = 18607 AND `Item` IN (
+27494, -- Emerald Eye Bracer
+27505, -- Ruby Helm of the Just
+27507, -- Adamantine Repeater
+27495, -- Soldier's Dog Tag
+27497, -- Doomplate Gauntlets
+27506  -- Robe of Effervescent Light
+);
+-- Hellfire Ramparts / Omor the Breaker
+UPDATE `creature_loot_template` SET `GroupID` = 5 WHERE `Entry` = 18433 AND `Item` IN (
+27463, -- Terror Flame Dagger
+27465, -- Mana-Etched Gloves
+27464, -- Omor's Unyielding Will
+27462, -- Crimson Bracers of Gloom
+27466, -- Headdress of Alacricity
+27467  -- Silent-Strider Kneeboots
+);
+-- Hellfire Ramparts / Reinforced Fel Iron Chest
+DELETE FROM `gameobject_loot_template` WHERE (`Entry` = 21764) AND (`Item` IN (1, 2, 3, 4));
+INSERT INTO `gameobject_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(21764, 1, 35093, 100, 0, 1, 1, 1, 2, 'Reinforced Fel Iron Chest - (ReferenceTable)'),
+(21764, 2, 35093, 100, 0, 1, 2, 1, 1, 'Reinforced Fel Iron Chest - (ReferenceTable)'),
+(21764, 3, 35094, 30, 0, 1, 0, 1, 1, 'Reinforced Fel Iron Chest - (ReferenceTable)'),
+(21764, 4, 25009, 100, 0, 1, 0, 1, 1, 'Reinforced Fel Iron Chest - (ReferenceTable)');
+UPDATE `reference_loot_template` SET `GroupID` = 2 WHERE `Entry` = 35093 AND `Item` IN (
+27455, -- Irondrake Faceguard
+27453, -- Averinn's Ring of Slaying
+27452, -- Light Scribe Bands
+27454, -- Volcanic Pauldrons
+27456  -- Raiments of Nature's Breath
+);

From 37382dcd8ad99c1c53186a36388e05cf7d67434d Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Tue, 11 Jul 2023 01:38:39 +0000
Subject: [PATCH 36/46] chore(DB): import pending files

Referenced commit(s): 89959a193f5cae0e96901e3a3360cfa83d4d099e
---
 .../rev_1688915874765152000.sql => db_world/2023_07_11_00.sql}   | 1 +
 .../rev_1689020767712933600.sql => db_world/2023_07_11_01.sql}   | 1 +
 2 files changed, 2 insertions(+)
 rename data/sql/updates/{pending_db_world/rev_1688915874765152000.sql => db_world/2023_07_11_00.sql} (98%)
 rename data/sql/updates/{pending_db_world/rev_1689020767712933600.sql => db_world/2023_07_11_01.sql} (86%)

diff --git a/data/sql/updates/pending_db_world/rev_1688915874765152000.sql b/data/sql/updates/db_world/2023_07_11_00.sql
similarity index 98%
rename from data/sql/updates/pending_db_world/rev_1688915874765152000.sql
rename to data/sql/updates/db_world/2023_07_11_00.sql
index 9bbce1c11..8f995a382 100644
--- a/data/sql/updates/pending_db_world/rev_1688915874765152000.sql
+++ b/data/sql/updates/db_world/2023_07_11_00.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_10_03 -> 2023_07_11_00
 -- Old Hillsbrad Foothills
 UPDATE `creature_loot_template` SET `GroupID` = 7 WHERE `Entry` = 20531 AND `Item` IN (
 27904, -- Resounding Ring of Glory
diff --git a/data/sql/updates/pending_db_world/rev_1689020767712933600.sql b/data/sql/updates/db_world/2023_07_11_01.sql
similarity index 86%
rename from data/sql/updates/pending_db_world/rev_1689020767712933600.sql
rename to data/sql/updates/db_world/2023_07_11_01.sql
index 8e02a0ef0..c799be6ef 100644
--- a/data/sql/updates/pending_db_world/rev_1689020767712933600.sql
+++ b/data/sql/updates/db_world/2023_07_11_01.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_11_00 -> 2023_07_11_01
 --
 DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 30658 AND `spell_effect` = 30571;
 DELETE FROM `spell_script_names` WHERE `ScriptName` = ('spell_magtheridon_quake');

From 5719ff45cf079c04139f650aebac59cab0f6aaff Mon Sep 17 00:00:00 2001
From: Angelo Venturini <nefertum.dev@protonmail.com>
Date: Tue, 11 Jul 2023 20:21:37 -0300
Subject: [PATCH 37/46] fix(DB/SAI): Fingrom Blast Wave (#16737)

* fix(DB/SAI): Fingrom Blast Wave

* Update rev_1689094675369155000.sql

---------

Co-authored-by: Gultask <100873791+Gultask@users.noreply.github.com>
---
 .../updates/pending_db_world/rev_1689094675369155000.sql    | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1689094675369155000.sql

diff --git a/data/sql/updates/pending_db_world/rev_1689094675369155000.sql b/data/sql/updates/pending_db_world/rev_1689094675369155000.sql
new file mode 100644
index 000000000..61ce85a2c
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1689094675369155000.sql
@@ -0,0 +1,6 @@
+--
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20757);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(20757, 0, 0, 0, 0, 0, 100, 0, 3000, 4800, 12000, 16000, 0, 11, 33245, 32, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Fingrom - In Combat - Cast \'Ice Barrier\''),
+(20757, 0, 1, 0, 9, 0, 100, 0, 0, 10, 5000, 11000, 1, 11, 33061, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Fingrom - Within 0-10 Range - Cast \'Blast Wave\''),
+(20757, 0, 2, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 0, 11, 15242, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Fingrom - In Combat - Cast \'Fireball\'');

From d10656ee2d15e972a6fe1791a2924b9fe530184e Mon Sep 17 00:00:00 2001
From: Eddy Vega <61223313+Si1ker@users.noreply.github.com>
Date: Tue, 11 Jul 2023 17:23:25 -0600
Subject: [PATCH 38/46] fix(DB/Loot): Remove loot from Hellfire Channeler
 (#16738)

init
---
 data/sql/updates/pending_db_world/rev_1689097520967716500.sql | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1689097520967716500.sql

diff --git a/data/sql/updates/pending_db_world/rev_1689097520967716500.sql b/data/sql/updates/pending_db_world/rev_1689097520967716500.sql
new file mode 100644
index 000000000..7cb237a74
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1689097520967716500.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `creature_template` SET `lootid`=0 WHERE `entry`=17256;
+

From 55d5138ccf0f32abd674275b2d85d05434b5f543 Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Tue, 11 Jul 2023 23:25:39 +0000
Subject: [PATCH 39/46] chore(DB): import pending files

Referenced commit(s): d10656ee2d15e972a6fe1791a2924b9fe530184e
---
 .../rev_1689094675369155000.sql => db_world/2023_07_11_02.sql}   | 1 +
 .../rev_1689097520967716500.sql => db_world/2023_07_11_03.sql}   | 1 +
 2 files changed, 2 insertions(+)
 rename data/sql/updates/{pending_db_world/rev_1689094675369155000.sql => db_world/2023_07_11_02.sql} (95%)
 rename data/sql/updates/{pending_db_world/rev_1689097520967716500.sql => db_world/2023_07_11_03.sql} (60%)

diff --git a/data/sql/updates/pending_db_world/rev_1689094675369155000.sql b/data/sql/updates/db_world/2023_07_11_02.sql
similarity index 95%
rename from data/sql/updates/pending_db_world/rev_1689094675369155000.sql
rename to data/sql/updates/db_world/2023_07_11_02.sql
index 61ce85a2c..d50c77ac4 100644
--- a/data/sql/updates/pending_db_world/rev_1689094675369155000.sql
+++ b/data/sql/updates/db_world/2023_07_11_02.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_11_01 -> 2023_07_11_02
 --
 DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20757);
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
diff --git a/data/sql/updates/pending_db_world/rev_1689097520967716500.sql b/data/sql/updates/db_world/2023_07_11_03.sql
similarity index 60%
rename from data/sql/updates/pending_db_world/rev_1689097520967716500.sql
rename to data/sql/updates/db_world/2023_07_11_03.sql
index 7cb237a74..10ffd1fb0 100644
--- a/data/sql/updates/pending_db_world/rev_1689097520967716500.sql
+++ b/data/sql/updates/db_world/2023_07_11_03.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_11_02 -> 2023_07_11_03
 --
 UPDATE `creature_template` SET `lootid`=0 WHERE `entry`=17256;
 

From e4d64ec319b6feac3b6d95734ec292efd25e1bb5 Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Wed, 12 Jul 2023 00:46:10 -0300
Subject: [PATCH 40/46] fix(Scripts/GruulLair): Fix Maulgar not casting
 intimidating shout (#16743)

---
 .../scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index b59eeec83..71ce4f2cd 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -85,7 +85,7 @@ struct boss_high_king_maulgar : public BossAI
                 context.Repeat(35s);
             }).Schedule(0ms, [this](TaskContext context)
             {
-                DoCastSelf(SPELL_ROAR);
+                DoCastVictim(SPELL_ROAR);
                 context.Repeat(20600ms, 29100ms);
             });
         });

From 3a3dc6446bad9d571be1840af41752148b6d6848 Mon Sep 17 00:00:00 2001
From: wenzuowei <wenzuowei110@gmail.com>
Date: Wed, 12 Jul 2023 19:04:39 +0800
Subject: [PATCH 41/46] fix(Core/Gossip): Fix gossip menu for locale clients
 (#16531)

* fix(Core/Gossip): Fix gossip menu for locale clients

* using gossip_menu_option texts by default

---------

Co-authored-by: wzw1990 <>
---
 src/server/game/Entities/Player/PlayerGossip.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/server/game/Entities/Player/PlayerGossip.cpp b/src/server/game/Entities/Player/PlayerGossip.cpp
index e6fcb518c..77bc1901a 100644
--- a/src/server/game/Entities/Player/PlayerGossip.cpp
+++ b/src/server/game/Entities/Player/PlayerGossip.cpp
@@ -164,33 +164,31 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool
 
         if (canTalk)
         {
+            // using gossip_menu_option texts by default
+            std::string strOptionText = itr->second.OptionText;
+            std::string strBoxText = itr->second.BoxText;
             // search in broadcast_text and broadcast_text_locale
-            std::string strOptionText, strBoxText;
             BroadcastText const* optionBroadcastText = sObjectMgr->GetBroadcastText(itr->second.OptionBroadcastTextID);
             BroadcastText const* boxBroadcastText = sObjectMgr->GetBroadcastText(itr->second.BoxBroadcastTextID);
             LocaleConstant locale = GetSession()->GetSessionDbLocaleIndex();
 
             if (optionBroadcastText)
                 ObjectMgr::GetLocaleString(getGender() == GENDER_MALE ? optionBroadcastText->MaleText : optionBroadcastText->FemaleText, locale, strOptionText);
-            else
-                strOptionText = itr->second.OptionText;
 
             if (boxBroadcastText)
                 ObjectMgr::GetLocaleString(getGender() == GENDER_MALE ? boxBroadcastText->MaleText : boxBroadcastText->FemaleText, locale, strBoxText);
-            else
-                strBoxText = itr->second.BoxText;
 
             // if the language is not default and the texts weren't found, maybe they're in gossip_menu_option_locale table
             if (locale != DEFAULT_LOCALE)
             {
-                if (strOptionText.empty())
+                if (!optionBroadcastText)
                 {
                     /// Find localizations from database.
                     if (GossipMenuItemsLocale const* gossipMenuLocale = sObjectMgr->GetGossipMenuItemsLocale(MAKE_PAIR32(menuId, itr->second.OptionID)))
                         ObjectMgr::GetLocaleString(gossipMenuLocale->OptionText, locale, strOptionText);
                 }
 
-                if (strBoxText.empty())
+                if (!boxBroadcastText)
                 {
                     /// Find localizations from database.
                     if (GossipMenuItemsLocale const* gossipMenuLocale = sObjectMgr->GetGossipMenuItemsLocale(MAKE_PAIR32(menuId, itr->second.OptionID)))

From 9b5933ac5f12d42ec76aa346081eb12074d1de06 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Wed, 12 Jul 2023 12:58:34 -0300
Subject: [PATCH 42/46] chore(DB): Fix Blast Wave ID (#16744)

Update 2023_07_11_02.sql
---
 data/sql/updates/db_world/2023_07_11_02.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/sql/updates/db_world/2023_07_11_02.sql b/data/sql/updates/db_world/2023_07_11_02.sql
index d50c77ac4..3325a9efd 100644
--- a/data/sql/updates/db_world/2023_07_11_02.sql
+++ b/data/sql/updates/db_world/2023_07_11_02.sql
@@ -3,5 +3,5 @@
 DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20757);
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
 (20757, 0, 0, 0, 0, 0, 100, 0, 3000, 4800, 12000, 16000, 0, 11, 33245, 32, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Fingrom - In Combat - Cast \'Ice Barrier\''),
-(20757, 0, 1, 0, 9, 0, 100, 0, 0, 10, 5000, 11000, 1, 11, 33061, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Fingrom - Within 0-10 Range - Cast \'Blast Wave\''),
+(20757, 0, 1, 0, 9, 0, 100, 0, 0, 10, 5000, 11000, 1, 11, 17145, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Fingrom - Within 0-10 Range - Cast \'Blast Wave\''),
 (20757, 0, 2, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 0, 11, 15242, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Fingrom - In Combat - Cast \'Fireball\'');

From a8964a6ed1dc9295a85a816e5d11740e90a1fb79 Mon Sep 17 00:00:00 2001
From: Angelo Venturini <nefertum.dev@protonmail.com>
Date: Wed, 12 Jul 2023 14:17:34 -0300
Subject: [PATCH 43/46] fix(Core/Magtheridon): Fix Manticron Cube mechanic
 (#16745)

---
 .../HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index 43a25f4b0..f2446b610 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -18,6 +18,7 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
+#include "TaskScheduler.h"
 #include "magtheridons_lair.h"
 
 enum Yells
@@ -93,6 +94,7 @@ struct boss_magtheridon : public BossAI
         BossAI::Reset();
         _currentPhase = 0;
         _recentlySpoken = false;
+        _interruptScheduler.CancelAll();
         scheduler.Schedule(90s, [this](TaskContext context)
         {
             Talk(SAY_TAUNT);
@@ -186,7 +188,7 @@ struct boss_magtheridon : public BossAI
                 {
                     DoCastSelf(SPELL_BLAST_NOVA);
 
-                    scheduler.Schedule(50ms, GROUP_INTERRUPT_CHECK, [this](TaskContext context)
+                    _interruptScheduler.Schedule(50ms, GROUP_INTERRUPT_CHECK, [this](TaskContext context)
                     {
                         if (me->GetAuraCount(SPELL_SHADOW_GRASP_VISUAL) == 5)
                         {
@@ -197,7 +199,7 @@ struct boss_magtheridon : public BossAI
                         context.Repeat(50ms);
                     }).Schedule(12s, GROUP_INTERRUPT_CHECK, [this](TaskContext /*context*/)
                     {
-                        scheduler.CancelGroup(GROUP_INTERRUPT_CHECK);
+                        _interruptScheduler.CancelGroup(GROUP_INTERRUPT_CHECK);
                     });
                 });
                 context.Repeat(53s, 56s);
@@ -214,6 +216,7 @@ struct boss_magtheridon : public BossAI
             return;
 
         scheduler.Update(diff);
+        _interruptScheduler.Update(diff);
 
         if (_currentPhase != 1)
         {
@@ -224,6 +227,7 @@ struct boss_magtheridon : public BossAI
 private:
     bool _recentlySpoken;
     uint8 _currentPhase;
+    TaskScheduler _interruptScheduler;
 };
 
 class spell_magtheridon_blaze : public SpellScript

From 5aa44033ab3d0b42561fd47bb22bcd59098a6ecd Mon Sep 17 00:00:00 2001
From: Angelo Venturini <nefertum.dev@protonmail.com>
Date: Wed, 12 Jul 2023 16:08:13 -0300
Subject: [PATCH 44/46] fix(Scripts/MagtheridonsLair): Fix emote spam (#16746)

---
 .../HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index f2446b610..d537d9a50 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -196,7 +196,8 @@ struct boss_magtheridon : public BossAI
                             me->InterruptNonMeleeSpells(true);
                             scheduler.CancelGroup(GROUP_INTERRUPT_CHECK);
                         }
-                        context.Repeat(50ms);
+                        else
+                            context.Repeat(50ms);
                     }).Schedule(12s, GROUP_INTERRUPT_CHECK, [this](TaskContext /*context*/)
                     {
                         _interruptScheduler.CancelGroup(GROUP_INTERRUPT_CHECK);

From 3215aa23acb8b923bd7122e378be8b0919cf3442 Mon Sep 17 00:00:00 2001
From: neifion-00000000 <91289495+neifion-00000000@users.noreply.github.com>
Date: Wed, 12 Jul 2023 16:28:52 -0500
Subject: [PATCH 45/46] fix(DB/SAI): Mosh'Ogg Witch Doctor SAI fix (#16742)

* fix(db/scripts): Mosh'Ogg Witch Doctor SAI fix

* Update rev_1689122352995380700.sql - spacing
---
 data/sql/updates/pending_db_world/rev_1689122352995380700.sql | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1689122352995380700.sql

diff --git a/data/sql/updates/pending_db_world/rev_1689122352995380700.sql b/data/sql/updates/pending_db_world/rev_1689122352995380700.sql
new file mode 100644
index 000000000..71b1d0c0a
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1689122352995380700.sql
@@ -0,0 +1,3 @@
+-- Mosh'Ogg Witch Doctor SAI flag correction
+UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid`=1144 AND `source_type`=0 AND `id`=0 AND `link`=0;
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid`=1144 AND `source_type`=0 AND `id`=1 AND `link`=0;

From 79b304cf082a20aaed63f7acd3e347d7ed1c946e Mon Sep 17 00:00:00 2001
From: AzerothCoreBot <azerothcorebot@gmail.com>
Date: Wed, 12 Jul 2023 21:31:18 +0000
Subject: [PATCH 46/46] chore(DB): import pending files

Referenced commit(s): 3215aa23acb8b923bd7122e378be8b0919cf3442
---
 .../rev_1689122352995380700.sql => db_world/2023_07_12_00.sql}   | 1 +
 1 file changed, 1 insertion(+)
 rename data/sql/updates/{pending_db_world/rev_1689122352995380700.sql => db_world/2023_07_12_00.sql} (86%)

diff --git a/data/sql/updates/pending_db_world/rev_1689122352995380700.sql b/data/sql/updates/db_world/2023_07_12_00.sql
similarity index 86%
rename from data/sql/updates/pending_db_world/rev_1689122352995380700.sql
rename to data/sql/updates/db_world/2023_07_12_00.sql
index 71b1d0c0a..8696f6a17 100644
--- a/data/sql/updates/pending_db_world/rev_1689122352995380700.sql
+++ b/data/sql/updates/db_world/2023_07_12_00.sql
@@ -1,3 +1,4 @@
+-- DB update 2023_07_11_03 -> 2023_07_12_00
 -- Mosh'Ogg Witch Doctor SAI flag correction
 UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid`=1144 AND `source_type`=0 AND `id`=0 AND `link`=0;
 UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid`=1144 AND `source_type`=0 AND `id`=1 AND `link`=0;