Merge branch 'master' into GurtoggFix

data/sql/updates/db_world/2025_01_24_00.sql

@@ -0,0 +1,22 @@
+-- DB update 2025_01_23_04 -> 2025_01_24_00
+-- Fix Kaelthas HC
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 24857) AND (`Item` IN (23572, 25028, 25029, 34609, 34610, 34611, 34612, 34613, 34614, 34615, 34616));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(24857, 23572, 0, 100, 0, 1, 0, 1, 1, 'Kael\'thas Sunstrider (1) - Primal Nether'),
+(24857, 34612, 0, 0, 0, 1, 1, 1, 1, 'Kael\'thas Sunstrider (1) - Greaves of the Penitent Knight'),
+(24857, 34609, 0, 0, 0, 1, 1, 1, 1, 'Kael\'thas Sunstrider (1) - Quickening Blade of the Prince'),
+(24857, 34611, 0, 0, 0, 1, 1, 1, 1, 'Kael\'thas Sunstrider (1) - Cudgel of Consecration'),
+(24857, 34610, 0, 0, 0, 1, 1, 1, 1, 'Kael\'thas Sunstrider (1) - Scarlet Sin\'dorei Robes'),
+(24857, 34614, 0, 0, 0, 1, 2, 1, 1, 'Kael\'thas Sunstrider (1) - Tunic of the Ranger Lord'),
+(24857, 34615, 0, 0, 0, 1, 2, 1, 1, 'Kael\'thas Sunstrider (1) - Netherforce Chestplate'),
+(24857, 34616, 0, 0, 0, 1, 2, 1, 1, 'Kael\'thas Sunstrider (1) - Breeching Comet'),
+(24857, 34613, 0, 0, 0, 1, 2, 1, 1, 'Kael\'thas Sunstrider (1) - Shoulderpads of the Silvermoon Retainer');
+
+-- Remove normal loot from Delrissa HC
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 25560) AND (`Item` IN (25027));
+
+-- Remove normal loot from Vexallus HC
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 25573) AND (`Item` IN (25026));
+
+-- Remove normal loot from Selin Fireheart HC
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 25562) AND (`Item` IN (25025));

data/sql/updates/db_world/2025_01_24_01.sql

@@ -0,0 +1,4 @@
+-- DB update 2025_01_24_00 -> 2025_01_24_01
+--
+-- Remove extra Sanctum Planetarium
+DELETE FROM `gameobject` WHERE (`id` = 188081) AND (`guid` IN (27809));

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp

@@ -79,7 +79,6 @@ struct boss_felblood_kaelthas : public BossAI
         _gravityLapseCounter = 0;
         me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, false);
         me->SetImmuneToAll(false);
-        summons.DespawnAll();
 
         ScheduleHealthCheckEvent(50, [&]{
             me->CastStop();

src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h

@@ -40,8 +40,8 @@ enum MTCreatures
     NPC_DELRISSA                = 24560,
     NPC_FEL_CRYSTAL             = 24722,
     NPC_KAEL_THAS               = 24664,
-    NPC_PHOENIX                 = 21362,
-    NPC_PHOENIX_EGG             = 21364,
+    NPC_PHOENIX                 = 24674,
+    NPC_PHOENIX_EGG             = 24675,
     NPC_KALECGOS                = 24844
 };