diff --git a/data/sql/updates/db_world/2023_04_18_03.sql b/data/sql/updates/db_world/2023_04_18_03.sql
new file mode 100644
index 000000000..4d920081b
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_18_03.sql
@@ -0,0 +1,5 @@
+-- DB update 2023_04_18_02 -> 2023_04_18_03
+--
+UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|33554432 WHERE (`entry` IN (18708, 20657));
+
+UPDATE `smart_scripts` SET `event_flags` = 1 WHERE (`entryorguid` = 18634) AND (`source_type` = 0) AND (`id` IN (3, 4));
diff --git a/data/sql/updates/db_world/2023_04_19_00.sql b/data/sql/updates/db_world/2023_04_19_00.sql
new file mode 100644
index 000000000..b40673649
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_00.sql
@@ -0,0 +1,5 @@
+-- DB update 2023_04_18_03 -> 2023_04_19_00
+-- Strider Clutchmother (2172)
+UPDATE `creature_formations` SET `groupAI`=`groupAI`|1 WHERE `leaderGUID`=36692 AND`memberGUID`=36692;
+UPDATE `creature_formations` SET `groupAI`=`groupAI`|1 WHERE `leaderGUID`=37385 AND`memberGUID`=36692;
+UPDATE `creature_formations` SET `groupAI`=`groupAI`|1 WHERE `leaderGUID`=37385 AND `memberGUID`=205803;
diff --git a/data/sql/updates/db_world/2023_04_19_01.sql b/data/sql/updates/db_world/2023_04_19_01.sql
new file mode 100644
index 000000000..c50f18121
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_01.sql
@@ -0,0 +1,7 @@
+-- DB update 2023_04_19_00 -> 2023_04_19_01
+--
+-- Create and Enable SmartAI for creature 348 to enable broadcasts
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=348;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 348;
+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 
+(348, 0, 0, 0, 1, 0, 100, 0, 20000, 30000, 603000, 603000, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Zem Leedward - Out of Combat - Say Line 0');
diff --git a/data/sql/updates/db_world/2023_04_19_02.sql b/data/sql/updates/db_world/2023_04_19_02.sql
new file mode 100644
index 000000000..b765da905
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_02.sql
@@ -0,0 +1,5 @@
+-- DB update 2023_04_19_01 -> 2023_04_19_02
+--
+-- Remove skinning loot from Buzzard creatures
+UPDATE `creature_template` SET `skinloot` = 0 WHERE `entry` IN (5982, 5983, 5436, 7376);
+DELETE FROM `skinning_loot_template` WHERE `Entry` IN (5982, 5983);
diff --git a/data/sql/updates/db_world/2023_04_19_03.sql b/data/sql/updates/db_world/2023_04_19_03.sql
new file mode 100644
index 000000000..27e64e031
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_03.sql
@@ -0,0 +1,5 @@
+-- DB update 2023_04_19_02 -> 2023_04_19_03
+--
+-- Remove Roughshod Pikes from any creature
+DELETE FROM `creature_loot_template` WHERE `Item` = 12533;
+UPDATE `creature_template` SET `lootid`=0 WHERE `entry`=415;
diff --git a/data/sql/updates/db_world/2023_04_19_04.sql b/data/sql/updates/db_world/2023_04_19_04.sql
new file mode 100644
index 000000000..46aa13f66
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_04.sql
@@ -0,0 +1,16 @@
+-- DB update 2023_04_19_03 -> 2023_04_19_04
+-- 21767 (Harbinger of the Raven)
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21767);
+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
+(21767, 0, 0, 1, 54, 0, 100, 512, 0, 0, 0, 0, 0, 1, 0, 7000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Just Summoned - Say Line 0'),
+(21767, 0, 1, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Just Summoned - Set Gravity Off'),
+(21767, 0, 2, 0, 60, 0, 100, 257, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 3211, 5348.21, 146.53, 5.54, 'Harbinger of the Raven - On Update - Move To Position'),
+(21767, 0, 3, 4, 52, 0, 100, 0, 0, 21767, 0, 0, 0, 11, 37446, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text Over Line 0 - Cast Ruuan ok Oracle Transformation'),
+(21767, 0, 4, 5, 61, 0, 100, 512, 0, 0, 0, 0, 0, 2, 954, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text Over Line 0 - Set Faction'),
+(21767, 0, 5, 6, 61, 0, 100, 512, 0, 0, 0, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text Over Line 0 - Set Reactstate Aggressive'),
+(21767, 0, 6, 7, 61, 0, 100, 512, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text Over Line 0 - Attack Start'),
+(21767, 0, 7, 8, 61, 0, 100, 512, 0, 0, 0, 0, 0, 210, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text Over Line 0 - Move Fall'),
+(21767, 0, 8, 9, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Text 0 Over - Set Gravity On'),
+(21767, 0, 9, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 3211, 5348.21, 144.53, 5.54, 'Harbinger of the Raven - On Text 0 Over - Set Home Position'),
+(21767, 0, 10, 0, 7, 0, 100, 512, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - On Evade - Despawn Instant'),
+(21767, 0, 11, 0, 1, 0, 100, 512, 15000, 15000, 15000, 15000, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Harbinger of the Raven - Out of Combat 15s - Despawn Instant');
diff --git a/data/sql/updates/db_world/2023_04_19_05.sql b/data/sql/updates/db_world/2023_04_19_05.sql
new file mode 100644
index 000000000..b45d56389
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_05.sql
@@ -0,0 +1,7 @@
+-- DB update 2023_04_19_04 -> 2023_04_19_05
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 19952) 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
+(19952, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Bloodmaul Geomancer - On Just Died - Say Line 1'),
+(19952, 0, 1, 0, 4, 0, 35, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Bloodmaul Geomancer - On Aggro - Say Line 0'),
+(19952, 0, 2, 0, 1, 0, 100, 0, 0, 0, 1800000, 1800000, 0, 11, 12544, 33, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Bloodmaul Geomancer - Out of Combat - Keep up \'Frost Armor\''),
+(19952, 0, 3, 0, 0, 0, 100, 0, 0, 0, 2400, 3800, 0, 11, 9053, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Bloodmaul Geomancer - In Combat - Cast \'Fireball\'');
diff --git a/data/sql/updates/db_world/2023_04_19_06.sql b/data/sql/updates/db_world/2023_04_19_06.sql
new file mode 100644
index 000000000..59db5b50c
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_06.sql
@@ -0,0 +1,3 @@
+-- DB update 2023_04_19_05 -> 2023_04_19_06
+-- Cyrukh the Firelord (21181)
+UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|42090322 WHERE `entry` = 21181;
diff --git a/data/sql/updates/db_world/2023_04_19_07.sql b/data/sql/updates/db_world/2023_04_19_07.sql
new file mode 100644
index 000000000..b80884f0f
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_07.sql
@@ -0,0 +1,4 @@
+-- DB update 2023_04_19_06 -> 2023_04_19_07
+--
+UPDATE `creature_addon` SET `visibilityDistanceType`=3 WHERE `guid`=128135;
+
diff --git a/data/sql/updates/db_world/2023_04_19_08.sql b/data/sql/updates/db_world/2023_04_19_08.sql
new file mode 100644
index 000000000..a0c3f9bde
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_08.sql
@@ -0,0 +1,3 @@
+-- DB update 2023_04_19_07 -> 2023_04_19_08
+-- Revert Fiery Payback 1m ICD.
+DELETE FROM `spell_proc_event` WHERE `entry` IN (64349,64350);
diff --git a/data/sql/updates/db_world/2023_04_19_09.sql b/data/sql/updates/db_world/2023_04_19_09.sql
new file mode 100644
index 000000000..7d5073447
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_09.sql
@@ -0,0 +1,4 @@
+-- DB update 2023_04_19_08 -> 2023_04_19_09
+-- 20668 (Fiendling Flesh Beast)
+UPDATE `creature_template` SET `AIName` = '' WHERE `entry` = 20668;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 20668 AND `source_type` = 0;
diff --git a/data/sql/updates/db_world/2023_04_19_10.sql b/data/sql/updates/db_world/2023_04_19_10.sql
new file mode 100644
index 000000000..39d6c88a4
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_10.sql
@@ -0,0 +1,3 @@
+-- DB update 2023_04_19_09 -> 2023_04_19_10
+-- Burko (18990), Aresella (18991) - Remove Gossip and Vendor npc flags.
+UPDATE `creature_template` SET `npcflag` = `npcflag`&~(128|1) WHERE `entry` IN (18990,18991);
diff --git a/data/sql/updates/db_world/2023_04_19_11.sql b/data/sql/updates/db_world/2023_04_19_11.sql
new file mode 100644
index 000000000..fe6e4da1c
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_11.sql
@@ -0,0 +1,4 @@
+-- DB update 2023_04_19_10 -> 2023_04_19_11
+-- Prospector Ryedol (2910)
+DELETE FROM `npc_vendor` WHERE `entry` = 2910;
+UPDATE `creature_template` SET `npcflag` = `npcflag`&~(128) WHERE `entry` = 2910;
diff --git a/data/sql/updates/db_world/2023_04_19_12.sql b/data/sql/updates/db_world/2023_04_19_12.sql
new file mode 100644
index 000000000..8074b8732
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_12.sql
@@ -0,0 +1,26 @@
+-- DB update 2023_04_19_11 -> 2023_04_19_12
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 18708) AND (`Item` IN (24309));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(18708, 24309, 0, 10, 0, 1, 0, 1, 1, 'Murmur - Pattern: Spellstrike Pants');
+
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 1) AND (`SourceGroup` = 18708) AND (`SourceEntry` = 24309);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(1, 18708, 24309, 0, 0, 7, 0, 197, 1, 0, 0, 0, 0, '', 'Requires Tailoring Skill ID 197, Minimum Skill Value 1');
+
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 16807) AND (`Item` IN (24312));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(16807, 24312, 0, 10, 0, 1, 0, 1, 1, 'Grand Warlock Nethekurse - Pattern: Spellstrike Hood');
+
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 1) AND (`SourceGroup` = 16807) AND (`SourceEntry` = 24312);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(1, 16807, 24312, 0, 0, 7, 0, 197, 1, 0, 0, 0, 0, '', 'Requires Tailoring Skill ID 197, Minimum Skill Value 1');
+
+UPDATE `creature_loot_template` SET `Chance`=10 WHERE `Item`=24313;
+
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 17978) AND (`Item` IN (24310));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(17978, 24310, 0, 10, 0, 1, 0, 1, 1, 'Thorngrin the Tender - Pattern: Battlecast Pants');
+
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 1) AND (`SourceGroup` = 17978) AND (`SourceEntry` = 24310);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(1, 17978, 24310, 0, 0, 7, 0, 197, 1, 0, 0, 0, 0, '', 'Requires Tailoring Skill ID 197, Minimum Skill Value 1');
diff --git a/data/sql/updates/db_world/2023_04_19_13.sql b/data/sql/updates/db_world/2023_04_19_13.sql
new file mode 100644
index 000000000..838911805
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_13.sql
@@ -0,0 +1,4 @@
+-- DB update 2023_04_19_12 -> 2023_04_19_13
+--
+-- Quicker Respawn Timer on Corporal Keeshan
+UPDATE `creature` SET `spawntimesecs`=120 WHERE `guid`=17874 AND `id1`=349;
diff --git a/data/sql/updates/db_world/2023_04_19_14.sql b/data/sql/updates/db_world/2023_04_19_14.sql
new file mode 100644
index 000000000..71292ac99
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_14.sql
@@ -0,0 +1,5 @@
+-- DB update 2023_04_19_13 -> 2023_04_19_14
+--
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 16473) AND (`source_type` = 0) AND (`id` IN (3));
+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
+(16473, 0, 3, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 11, 29680, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Spectral Performer - On Death - Cast Curtain Call');
diff --git a/data/sql/updates/db_world/2023_04_19_15.sql b/data/sql/updates/db_world/2023_04_19_15.sql
new file mode 100644
index 000000000..41c31a364
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_15.sql
@@ -0,0 +1,41 @@
+-- DB update 2023_04_19_14 -> 2023_04_19_15
+-- 22199 (Slaag)
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 22199);
+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
+(22199, 0, 0, 1, 0, 0, 100, 0, 20000, 30000, 20000, 30000, 0, 11, 33958, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Slaag - In Combat - Cast \'Enrage\''),
+(22199, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Slaag - In Combat - Say Line 0'),
+(22199, 0, 2, 0, 0, 0, 100, 0, 27000, 32000, 27000, 32000, 0, 11, 21909, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Slaag - In Combat - Cast \'Dust Field\''),
+(22199, 0, 3, 0, 6, 0, 100, 512, 0, 0, 0, 0, 0, 11, 39898, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Slaag - On Just Died - Cast \'Slaag: Summon Slaag`s Standard Chest\'');
+
+-- 20600 (Maggoc)
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20600);
+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
+(20600, 0, 0, 0, 0, 0, 100, 0, 3000, 6000, 8000, 12000, 0, 11, 38770, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - In Combat - Cast \'Mortal Wound\''),
+(20600, 0, 1, 0, 0, 0, 100, 0, 3000, 6000, 5000, 10000, 0, 11, 38777, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - In Combat - Cast \'Rock Rumble\''),
+(20600, 0, 2, 0, 0, 0, 100, 0, 4000, 7000, 5000, 10000, 0, 11, 42139, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - In Combat - Cast \'Boulder\''),
+(20600, 0, 3, 4, 2, 0, 100, 0, 0, 30, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - Between 0-30% Health - Say Line 0'),
+(20600, 0, 4, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 11, 40743, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - Between 0-30% Health - Cast \'Frenzy\''),
+(20600, 0, 5, 0, 6, 0, 100, 512, 0, 0, 0, 0, 0, 11, 39891, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Maggoc - On Just Died - Cast \'Maggoc: Summon Maggoc`s Treasure Chest\'');
+
+-- 20216 (Grulloc)
+DELETE FROM `creature_text` WHERE `CreatureID`=20216;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(20216, 0, 0, '%s grows massively powerful!', 16, 0, 100, 0, 0, 0, 20101, 0, 'Grulloc'),
+(20216, 1, 0, 'Grulloc having lots of fun!', 14, 0, 100, 0, 0, 0, 19841, 0, 'Grulloc'),
+(20216, 2, 0, 'Me hungry!', 14, 0, 100, 0, 0, 0, 19842, 0, 'Grulloc'),
+(20216, 3, 0, 'Me keep piggy as pet!', 14, 0, 100, 0, 0, 0, 20259, 0, 'Grulloc'),
+(20216, 4, 0, 'Me like soft bacon!', 14, 0, 100, 0, 0, 0, 20258, 0, 'Grulloc'),
+(20216, 5, 0, 'Mmm, other white meat!', 14, 0, 100, 0, 0, 0, 19844, 0, 'Grulloc'),
+(20216, 6, 0, 'Piggy stop!', 14, 0, 100, 0, 0, 0, 19845, 0, 'Grulloc'),
+(20216, 7, 0, 'Porkchops!', 14, 0, 100, 0, 0, 0, 19857, 0, 'Grulloc'),
+(20216, 8, 0, 'Where piggy go?!', 14, 0, 100, 0, 0, 0, 19846, 0, 'Grulloc'),
+(20216, 9, 0, 'You be Grulloc\'s friend!', 14, 0, 100, 0, 0, 0, 19843, 0, 'Grulloc');
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20216);
+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
+(20216, 0, 0, 1, 0, 0, 100, 0, 10000, 20000, 18000, 28000, 0, 11, 38771, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - In Combat - Cast \'Burning Rage\''),
+(20216, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - In Combat - Say Line 0'),
+(20216, 0, 2, 0, 0, 0, 100, 0, 5000, 9000, 12000, 17000, 0, 11, 21055, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - In Combat - Cast \'Crush Armor\''),
+(20216, 0, 3, 0, 0, 0, 100, 0, 6000, 17000, 5000, 10000, 0, 11, 38772, 32, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - In Combat - Cast \'Grievous Wound\''),
+(20216, 0, 4, 0, 6, 0, 100, 512, 0, 0, 0, 0, 0, 11, 39890, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - On Just Died - Cast \'Grulloc: Summon Grulloc`s Dragon Skull Chest\''),
+(20216, 0, 5, 0, 8, 0, 100, 0, 38360, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Grulloc - On Spellhit \'Huffer Threatens Grulloc\' - Start Attacking');
diff --git a/data/sql/updates/db_world/2023_04_19_16.sql b/data/sql/updates/db_world/2023_04_19_16.sql
new file mode 100644
index 000000000..d84acf4f9
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_16.sql
@@ -0,0 +1,3 @@
+-- DB update 2023_04_19_15 -> 2023_04_19_16
+-- 21735 (Infernal Oversoul)
+UPDATE `event_scripts` SET `x` = -3368.91, `y` = 2145.37, `z` = -8.39026, `o` = 4.4855 WHERE `id` = 13980 AND `datalong` = 21735;
diff --git a/data/sql/updates/db_world/2023_04_19_17.sql b/data/sql/updates/db_world/2023_04_19_17.sql
new file mode 100644
index 000000000..706de6315
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_17.sql
@@ -0,0 +1,6 @@
+-- DB update 2023_04_19_16 -> 2023_04_19_17
+-- 184073 (Ethereal Teleport Pad)
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` = 8062;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15, 8062, 0, 0, 0, 29, 1, 20518, 10, 0, 1, 0, 0, '', '(AND) Ethereal Teleport Pad - Show Gossip option 0 only if no Image of Wind Trader Marid is within 10y.'),
+(15, 8062, 0, 0, 0, 47, 0, 10270, 66, 0, 0, 0, 0, '', '(AND) Ethereal Teleport Pad - Show Gossip option 0 only if quest A Not-So-Modest Proposal has been completed or rewarded.');
diff --git a/data/sql/updates/db_world/2023_04_19_18.sql b/data/sql/updates/db_world/2023_04_19_18.sql
new file mode 100644
index 000000000..66954c131
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_18.sql
@@ -0,0 +1,4 @@
+-- DB update 2023_04_19_17 -> 2023_04_19_18
+--
+UPDATE `smart_scripts` SET `event_flags`=0, `event_param1`=8000, `event_param2`=12000, `event_param3`=28000, `event_param4`=32000, `target_type`=6, `comment`='Fel Overseer - In Combat - Cast \'Frightening Shout\'' WHERE `entryorguid`=18796 AND `source_type`=0 AND `id`=3 AND `link`=0;
+
diff --git a/data/sql/updates/db_world/2023_04_19_19.sql b/data/sql/updates/db_world/2023_04_19_19.sql
new file mode 100644
index 000000000..8d126953e
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_19.sql
@@ -0,0 +1,3 @@
+-- DB update 2023_04_19_18 -> 2023_04_19_19
+-- translation error
+UPDATE `acore_string` SET `locale_zhCN` = '事件 %u: %s%s\n开始时间: %s 结束时间: %s 发生: %s 全程（长度）: %s\n下一次状态改变: %s' WHERE `entry` = 586;
diff --git a/data/sql/updates/db_world/2023_04_19_20.sql b/data/sql/updates/db_world/2023_04_19_20.sql
new file mode 100644
index 000000000..d6256f592
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_20.sql
@@ -0,0 +1,3 @@
+-- DB update 2023_04_19_19 -> 2023_04_19_20
+-- DB update En'kilah Hatchling faction (Unable to fight or communicate with players)
+UPDATE `creature_template` SET `faction` = 634 WHERE `entry` IN (25388, 25389, 25390);
diff --git a/data/sql/updates/db_world/2023_04_19_21.sql b/data/sql/updates/db_world/2023_04_19_21.sql
new file mode 100644
index 000000000..864454c0b
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_21.sql
@@ -0,0 +1,8 @@
+-- DB update 2023_04_19_20 -> 2023_04_19_21
+-- Fel Reaver Sentinel
+DELETE FROM `spell_cooldown_overrides` WHERE `Id` IN (38055,38006,38052,37920);
+INSERT INTO `spell_cooldown_overrides` (`Id`, `RecoveryTime`, `CategoryRecoveryTime`, `StartRecoveryTime`, `StartRecoveryCategory`) VALUES 
+(38055, 10000, 10000, 0, 0),
+(38006, 10000, 10000, 0, 0),
+(38052, 15000, 15000, 0, 0),
+(37920, 30000, 30000, 0, 0);
diff --git a/data/sql/updates/db_world/2023_04_19_22.sql b/data/sql/updates/db_world/2023_04_19_22.sql
new file mode 100644
index 000000000..314ddc7d1
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_22.sql
@@ -0,0 +1,66 @@
+-- DB update 2023_04_19_21 -> 2023_04_19_22
+-- Quest: By Any Means Necessary 9978
+UPDATE `quest_template_addon` SET `SpecialFlags`=2 WHERE `ID`=9978;
+
+-- Empoor
+DELETE FROM `gossip_menu` WHERE `MenuID` = 7704 AND `TextID` = 9406;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES
+(7704, 9406);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15) AND `SourceGroup`=7704;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14, 7704, 9406, 0, 0, 28, 0, 9978, 0, 0, 0, 0, 0, '', 'Show gossip text 9406 if quest \'By Any Means Necessary\' is complete.'),
+(14, 7704, 9425, 0, 0, 8, 0, 9978, 0, 0, 0, 0, 0, '', 'Show gossip text 9425 if quest \'By Any Means Necessary\' has been rewarded.'),
+(15, 7704, 0, 0, 0, 47, 0, 9978, 8, 0, 0, 0, 0, '', 'Show gossip option 0 if quest 9978 is incomplete.'),
+(15, 7704, 1, 0, 0, 47, 0, 9978, 66, 0, 0, 0, 0, '', '(AND) Show gossip option 1 if quest \'By Any Means Necessary\' is complete or rewarded.'),
+(15, 7704, 1, 0, 0, 14, 0, 9979, 0, 0, 0, 0, 0, '', '(AND) Show gossip option 1 if quest \'Wind Trader Lathrai\' is not taken.');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 18482 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
+(18482, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 83, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Respawn - Remove Npc Flag Questgiver'),
+(18482, 0, 1, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Respawn - Set Invincibility at 1 HP'),
+(18482, 0, 2, 4, 62, 0, 100, 0, 7704, 0, 0, 0, 0, 80, 1848200, 2, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Gossip Option 0 Selected - Run Script'),
+(18482, 0, 3, 4, 62, 0, 100, 0, 7704, 1, 0, 0, 0, 80, 1848200, 2, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Gossip Option 1 Selected - Run Script'),
+(18482, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 78, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Gossip Option Selected - Reset All Scripts'),
+(18482, 0, 5, 0, 2, 0, 100, 1, 0, 1, 0, 0, 0, 80, 1848201, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - Between 0-1% Health - Run Script (No Repeat)'),
+(18482, 0, 6, 0, 0, 0, 100, 0, 3000, 5000, 9000, 12000, 0, 11, 12548, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - In Combat - Cast \'Frost Shock\''),
+(18482, 0, 7, 0, 23, 0, 100, 0, 12550, 0, 1000, 2000, 0, 11, 12550, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Has No Aura \'Lightning Shield\' - Cast \'Lightning Shield\''),
+(18482, 0, 8, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 80, 1848202, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Reset - Run Script');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 1848200 AND `source_type` = 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
+(1848200, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 2, 1679, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Set Faction 1679'),
+(1848200, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 18483, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Set Data 1 to Empoor\'s Bodyguard'),
+(1848200, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Say Line 0'),
+(1848200, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 40, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Start Attacking'),
+(1848200, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 103, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Root Disable');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 1848201 AND `source_type` = 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
+(1848201, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Set Faction 35'),
+(1848201, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Evade'),
+(1848201, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 103, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Root Enable'),
+(1848201, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 19, 18483, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Set Data 2 to Empoor\'s Bodyguard'),
+(1848201, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 15, 9978, 0, 0, 0, 0, 0, 18, 50, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Complete Quest \'By Any Means Necessary\''),
+(1848201, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 82, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Add Npc Flag Questgiver'),
+(1848201, 9, 6, 0, 0, 0, 100, 0, 120000, 120000, 0, 0, 0, 83, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Remove Npc Flag Questgiver'),
+(1848201, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 103, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Root Disable'),
+(1848201, 9, 8, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Say Line 1');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 1848202 AND `source_type` = 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
+(1848202, 9, 0, 0, 0, 0, 100, 0, 20000, 20000, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Set Faction 35'),
+(1848202, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 103, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor - On Script - Root Disable');
+
+-- Empoor's Bodyguard
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 18483;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 18483 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
+(18483, 0, 0, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 2, 1679, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - On Data Set - Set Faction 1679'),
+(18483, 0, 1, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 40, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - On Data Set - Start Attacking'),
+(18483, 0, 2, 0, 38, 0, 100, 0, 2, 2, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - On Data Set - Set Faction 35'),
+(18483, 0, 3, 0, 38, 0, 100, 0, 2, 2, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - On Data Set - Evade'),
+(18483, 0, 4, 0, 0, 0, 100, 0, 3000, 5000, 10000, 14000, 0, 11, 11977, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - In Combat - Cast \'Rend\''),
+(18483, 0, 5, 0, 0, 0, 100, 0, 5000, 7000, 15000, 20000, 0, 11, 13730, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - In Combat - Cast \'Demoralizing Shout\''),
+(18483, 0, 6, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 80, 1848202, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Empoor\'s Bodyguard - On Reset - Run Script');
diff --git a/data/sql/updates/db_world/2023_04_19_23.sql b/data/sql/updates/db_world/2023_04_19_23.sql
new file mode 100644
index 000000000..a3a8fcad4
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_23.sql
@@ -0,0 +1,5 @@
+-- DB update 2023_04_19_22 -> 2023_04_19_23
+--
+DELETE FROM `spell_custom_attr` WHERE `spell_id`=33684;
+INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES (33684,4096);
+
diff --git a/data/sql/updates/db_world/2023_04_19_24.sql b/data/sql/updates/db_world/2023_04_19_24.sql
new file mode 100644
index 000000000..f49f64eec
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_24.sql
@@ -0,0 +1,5 @@
+-- DB update 2023_04_19_23 -> 2023_04_19_24
+--
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|67108864 WHERE (`entry` IN (17722,17800,17803,17993,17994,18155,18404,18405,18420,18421,18422,18631,18632,18633,18634,18635,18639,18640,18641,19166,19168,19505,19510,19735,19767,20059,20864,20865,20867,20868,20873,20875,20881,20883,20988,20990,20625,20621,20622,21548,21545,21544,21549,21578,21574,21577,21570,20640,20642,20638,20648,20641,20647,20649,20643,21543,21539,21571,21522,21542,21541,21608,21607,21591,21593,21605,21604,21619,21615,21540,21523));
+
+DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `id` < 999 AND `entryorguid` IN (-25065,-138801,-138803,-138817,-138818,-138819,-138820,-138831,-138863,-138864,-138869,-138876,-138877,-138878,-138879,-138890,-138891,-138892,-138893,-138901,-138902,-138907,-138909,-138910,-138916,-138918,-138920,-138922,-138924,-138927,-138930,-138937,-138938,-138940,-138945,-138949,-142040,-142071,-142072,-142116,-146031,-146035,-146036,-146050,-146058,-146059,-146066,-146074,-146075,-146089,-146090,-146093,-146095,-146096,-146097,-146099,-146211,-146212,-146213,-146214,-146215,-146216,-146217,-146218,-146219,-146220,-146221,-146222,-146223,-146224,-146225,-146226,-146227,-146228,-146229,-147005,-147006,-147007,-147018,-147019,-147020,-147021,-147022,-147023,-147024,-147025,-147026,-147027,-147028,-147029,-147030,-147031,-147032,-147034,-147035,-147039,-147040,-147041,-147051,-147052,-147058,-147065,-147066,-147090,-147091,-147094,-147095);
diff --git a/data/sql/updates/db_world/2023_04_19_25.sql b/data/sql/updates/db_world/2023_04_19_25.sql
new file mode 100644
index 000000000..d98302eca
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_25.sql
@@ -0,0 +1,24 @@
+-- DB update 2023_04_19_24 -> 2023_04_19_25
+DELETE FROM `smart_scripts` WHERE `entryorguid`=25416 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
+(25416, 0, 0, 1, 4, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - On Aggro - Say Line 0'),
+(25416, 0, 1, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 42, 0, 5, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - On Respawn - Set Invincibility Hp 5%'),
+(25416, 0, 2, 0, 0, 0, 100, 1, 5000, 5000, 5000, 5000, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - In Combat - Say Line 2'),
+(25416, 0, 3, 4, 0, 0, 100, 1, 10000, 10000, 10000, 10000, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - In Combat - Say Line 3'),
+(25416, 0, 4, 5, 61, 0, 100, 1, 0, 0, 0, 0, 0, 134, 45599, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - Between 0-5% Health - Invoker Cast \'Boiling Point: Simmer Kill Credit\' (No Repeat)'),
+(25416, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - Between 0-5% Health - Say Line 1 (No Repeat)'),
+(25416, 0, 6, 7, 61, 0, 100, 512, 0, 0, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - Between 0-5% Health - Set Faction 35 (No Repeat)'),
+(25416, 0, 7, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - Between 0-5% Health - Evade (No Repeat)'),
+(25416, 0, 8, 0, 1, 0, 100, 512, 120000, 120000, 120000, 120000, 0, 2, 1983, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Simmer - Out of Combat - Set Faction 1983 (No Repeat)');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=25418 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
+(25418, 0, 0, 0, 0, 0, 100, 0, 5300, 5300, 9900, 9900, 0, 11, 50206, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - In Combat - Cast \'Scalding Steam\' (No Repeat)'),
+(25418, 0, 1, 0, 4, 0, 100, 512, 0, 0, 0, 0, 0, 42, 0, 5, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - On Aggro - Set Invincibility Hp 5% (No Repeat)'),
+(25418, 0, 2, 0, 0, 0, 100, 1, 5000, 5000, 5000, 5000, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - In Combat - Say Line 0 (No Repeat)'),
+(25418, 0, 3, 4, 0, 0, 100, 1, 10000, 10000, 10000, 10000, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - In Combat - Say Line 1 (No Repeat)'),
+(25418, 0, 4, 5, 61, 0, 100, 1, 0, 0, 0, 0, 0, 134, 45598, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - Between 0-5% Health - Invoker Cast \'Boiling Point: Churn Kill Credit\' (No Repeat)'),
+(25418, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - Between 0-5% Health - Say Line 2 (No Repeat)'),
+(25418, 0, 6, 7, 61, 0, 100, 512, 0, 0, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - Between 0-5% Health - Set Faction 35 (No Repeat)'),
+(25418, 0, 7, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - Between 0-5% Health - Evade (No Repeat)'),
+(25418, 0, 8, 0, 1, 0, 100, 512, 120000, 120000, 120000, 120000, 0, 2, 1984, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Churn - Out of Combat - Set Faction 1984 (No Repeat)');
diff --git a/data/sql/updates/db_world/2023_04_19_26.sql b/data/sql/updates/db_world/2023_04_19_26.sql
new file mode 100644
index 000000000..724a43192
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_26.sql
@@ -0,0 +1,44 @@
+-- DB update 2023_04_19_25 -> 2023_04_19_26
+-- ID 21861 (Vision of the Raven God), also set to not specified
+UPDATE `creature_template` SET `type` = 10 WHERE `entry` = 21861;
+
+DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryorguid` = 21861;
+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
+(21861, 0, 0, 1, 38, 0, 100, 0, 1, 1, 0, 0, 0, 11, 39426, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - On Data Set 1 - Cast credit'),
+(21861, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - Link - Say 0'),
+(21861, 0, 2, 3, 38, 0, 100, 0, 1, 2, 0, 0, 0, 11, 39428, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - On Data Set 2 - Cast credit'),
+(21861, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - Link - Say 1'),
+(21861, 0, 4, 5, 38, 0, 100, 0, 1, 3, 0, 0, 0, 11, 39430, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - On Data Set 3 - Cast credit'),
+(21861, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - Link - Say 2'),
+(21861, 0, 6, 7, 38, 0, 100, 0, 1, 4, 0, 0, 0, 11, 39431, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - On Data Set 4 - Cast credit'),
+(21861, 0, 7, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Vision of Raven God - Link - Say 3');
+
+-- The First Prophecy, also correct spawn position (previously falling from above)
+UPDATE `smart_scripts` SET `target_z` = 170.498 WHERE `source_type` = 1 AND `entryorguid` = 184950 AND `id` = 0;
+
+DELETE FROM `smart_scripts` WHERE `source_type` = 1 AND `entryorguid` = 184950 AND `id` IN (1,2,3);
+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
+(184950, 1, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'First Prophecy - Link - Store Targetlist'),
+(184950, 1, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'First Prophecy - Link - Send Target to Raven God'),
+(184950, 1, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'First Prophecy - Link - Set Data 1 to Raven God');
+
+-- The Second Prophecy
+DELETE FROM `smart_scripts` WHERE `source_type` = 1 AND `entryorguid` = 184967 AND `id` IN (1,2,3);
+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
+(184967, 1, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Second Prophecy - Link - Store Targetlist'),
+(184967, 1, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Second Prophecy - Link - Send Target to Raven God'),
+(184967, 1, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 2, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Second Prophecy - Link - Set Data 2 to Raven God');
+
+-- The Third Prophecy
+DELETE FROM `smart_scripts` WHERE `source_type` = 1 AND `entryorguid` = 184968 AND `id` IN (1,2,3);
+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
+(184968, 1, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Third Prophecy - Link - Store Targetlist'),
+(184968, 1, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Third Prophecy - Link - Send Target to Raven God'),
+(184968, 1, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 3, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Third Prophecy - Link - Set Data 3 to Raven God');
+
+-- The Fourth Prophecy
+DELETE FROM `smart_scripts` WHERE `source_type` = 1 AND `entryorguid` = 184969 AND `id` IN (1,2,3);
+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
+(184969, 1, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Fourth Prophecy - Link - Store Targetlist'),
+(184969, 1, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Fourth Prophecy - Link - Send Target to Raven God'),
+(184969, 1, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 4, 0, 0, 0, 0, 19, 21861, 20, 0, 0, 0, 0, 0, 0, 'Fourth Prophecy - Link - Set Data 4 to Raven God');
diff --git a/data/sql/updates/db_world/2023_04_19_27.sql b/data/sql/updates/db_world/2023_04_19_27.sql
new file mode 100644
index 000000000..00315a93e
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_27.sql
@@ -0,0 +1,8 @@
+-- DB update 2023_04_19_26 -> 2023_04_19_27
+-- Bosses on the Ogrila quest chain
+-- Slaag
+UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|545470038 WHERE `entry` = 22199;
+-- Maggoc, Grulloc, Skulloc Soulgrinder
+UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|579026774 WHERE `entry` IN (20600,20216,22910);
+-- Vim'gol the Vile
+UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|579026775 WHERE `entry` = 22911;
diff --git a/data/sql/updates/db_world/2023_04_19_28.sql b/data/sql/updates/db_world/2023_04_19_28.sql
new file mode 100644
index 000000000..f12d2605f
--- /dev/null
+++ b/data/sql/updates/db_world/2023_04_19_28.sql
@@ -0,0 +1,3 @@
+-- DB update 2023_04_19_27 -> 2023_04_19_28
+--
+UPDATE `creature_formations` SET `groupAI`=`groupAI`|1 WHERE `leaderGUID`=37385 AND `memberGUID`=37385;
diff --git a/src/server/game/Entities/Player/PlayerUpdates.cpp b/src/server/game/Entities/Player/PlayerUpdates.cpp
index 1799fe23d..ae7dfabb3 100644
--- a/src/server/game/Entities/Player/PlayerUpdates.cpp
+++ b/src/server/game/Entities/Player/PlayerUpdates.cpp
@@ -491,12 +491,11 @@ void Player::UpdateLocalChannels(uint32 newZone)
         {
             Channel* usedChannel = nullptr;
 
-            for (JoinedChannelsList::iterator itr = m_channels.begin();
-                 itr != m_channels.end(); ++itr)
+            for (Channel* channel : m_channels)
             {
-                if ((*itr)->GetChannelId() == i)
+                if (channel && channel->GetChannelId() == i)
                 {
-                    usedChannel = *itr;
+                    usedChannel = channel;
                     break;
                 }
             }
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index 58948980e..02d840c46 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -22,7 +22,7 @@
 enum BlackheartTheInciter
 {
     SPELL_INCITE_CHAOS      = 33676,
-    SPELL_INCITE_CHAOS_B    = 33684,                         //debuff applied to each member of party
+    SPELL_INCITE_CHAOS_B    = 33684,    //debuff applied to each member of party
     SPELL_CHARGE            = 33709,
     SPELL_WAR_STOMP         = 33707,
 
@@ -35,7 +35,7 @@ enum BlackheartTheInciter
     EVENT_SPELL_INCITE      = 1,
     EVENT_INCITE_WAIT       = 2,
     EVENT_SPELL_CHARGE      = 3,
-    EVENT_SPELL_KNOCKBACK   = 4
+    EVENT_SPELL_WAR_STOMP   = 4
 };
 
 class boss_blackheart_the_inciter : public CreatureScript
@@ -57,47 +57,54 @@ public:
 
         InstanceScript* instance;
         EventMap events;
-
         bool InciteChaos;
 
         void Reset() override
         {
             InciteChaos = false;
             events.Reset();
-
             if (instance)
+            {
                 instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED);
+            }
         }
 
         void KilledUnit(Unit* victim) override
         {
             if (victim->GetTypeId() == TYPEID_PLAYER && urand(0, 1))
+            {
                 Talk(SAY_SLAY);
+            }
         }
 
         void JustDied(Unit* /*killer*/) override
         {
             Talk(SAY_DEATH);
             if (instance)
+            {
                 instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE);
+            }
         }
 
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_AGGRO);
+            me->CallForHelp(100.0f);
             events.ScheduleEvent(EVENT_SPELL_INCITE, 24000);
             events.ScheduleEvent(EVENT_INCITE_WAIT, 15000);
-            events.ScheduleEvent(EVENT_SPELL_CHARGE, 0);
-            events.ScheduleEvent(EVENT_SPELL_KNOCKBACK, urand(16950, 26350));
-
+            events.ScheduleEvent(EVENT_SPELL_CHARGE, urand(30000, 50000));
+            events.ScheduleEvent(EVENT_SPELL_WAR_STOMP, urand(16950, 26350));
             if (instance)
+            {
                 instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS);
+            }
         }
 
         void EnterEvadeMode(EvadeReason why) override
         {
             if (InciteChaos && SelectTargetFromPlayerList(100.0f))
                 return;
+
             CreatureAI::EnterEvadeMode(why);
         }
 
@@ -114,14 +121,16 @@ public:
                     break;
                 case EVENT_SPELL_INCITE:
                     {
-                        me->CastSpell(me, SPELL_INCITE_CHAOS, false);
+                        DoCastAOE(SPELL_INCITE_CHAOS);
 
                         std::list<HostileReference*> t_list = me->GetThreatMgr().GetThreatList();
                         for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr)
                         {
                             Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid());
                             if (target && target->GetTypeId() == TYPEID_PLAYER)
+                            {
                                 me->CastSpell(target, SPELL_INCITE_CHAOS_B, true);
+                            }
                         }
 
                         DoResetThreatList();
@@ -132,12 +141,11 @@ public:
                         break;
                     }
                 case EVENT_SPELL_CHARGE:
-                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
-                        me->CastSpell(target, SPELL_CHARGE, false);
+                    DoCastRandomTarget(SPELL_CHARGE);
                     events.RepeatEvent(urand(30000, 50000));
                     break;
-                case EVENT_SPELL_KNOCKBACK:
-                    me->CastSpell(me, SPELL_WAR_STOMP, false);
+                case EVENT_SPELL_WAR_STOMP:
+                    DoCastAOE(SPELL_WAR_STOMP);
                     events.RepeatEvent(urand(16950, 26350));
                     break;
             }
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index 81b4780cc..a1fab0ef7 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -183,7 +183,7 @@ struct boss_murmur : public BossAI
             }).Schedule(3650ms, 9150ms, [this](TaskContext context)
             {
                 DoCastVictim(SPELL_SONIC_SHOCK);
-                context.Repeat(9150ms, 10s);
+                context.Repeat(3650ms, 9150ms);
             });
         }