Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]

Author: github-actions[bot]

data/sql/updates/db_characters/2026_03_30_00.sql

@@ -0,0 +1,6 @@
+-- DB update 2026_02_24_00 -> 2026_03_30_00
+--
+ALTER TABLE `bugreport`
+  ADD COLUMN `State` TINYINT NOT NULL DEFAULT 1,
+  ADD COLUMN `Assignee` VARCHAR(255) DEFAULT NULL,
+  ADD COLUMN `Comment` LONGTEXT DEFAULT NULL;

data/sql/updates/db_world/2026_03_30_00.sql

@@ -0,0 +1,10 @@
+-- DB update 2026_03_29_02 -> 2026_03_30_00
+-- Move Majordomo Executus Ragnaros summoning gossip chain to database
+-- Previously handled entirely in C++ script (sGossipHello/sGossipSelect)
+
+-- Add gossip_menu entries (MenuID -> TextID) for the gossip chain
+DELETE FROM `gossip_menu` WHERE `MenuID` IN (4093, 4108, 4109);
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES
+(4093, 4995),
+(4109, 5011),
+(4108, 5012);

src/server/game/AI/CreatureAI.cpp

@@ -309,12 +309,8 @@ void CreatureAI::EngagementOver()
 
 void CreatureAI::JustExitedCombat()
 {
-    EngagementOver();
-
-    // If creature is alive, in world, and not already evading, trigger evade to return home
-    // Check IsInWorld to avoid evade during server shutdown/cleanup
-    if (me->IsAlive() && me->IsInWorld() && !me->IsInEvadeMode())
-        EnterEvadeMode(EVADE_REASON_NO_HOSTILES);
+    // Creatures evade through UpdateVictim() detecting out-of-combat state.
+    // Scripts that need custom combat-exit behavior should override this.
 }
 
 /*void CreatureAI::AttackedBy(Unit* attacker)

src/server/game/Entities/Unit/Unit.cpp

@@ -5697,6 +5697,9 @@ void Unit::RemoveAllAurasExceptType(AuraType type)
 // Xinef: We should not remove passive auras on evade, if npc has player owner (scripted one cast auras)
 void Unit::RemoveEvadeAuras()
 {
+    if (IsCharmedOwnedByPlayerOrPlayer())
+        return;
+
     for (AuraApplicationMap::iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end();)
     {
         Aura const* aura = iter->second->GetBase();

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp

@@ -95,13 +95,7 @@ enum Events
 
 enum Misc
 {
-    TEXT_ID_SUMMON_1                        = 4995,
-    TEXT_ID_SUMMON_2                        = 5011,
-    TEXT_ID_SUMMON_3                        = 5012,
-
-    GOSSIP_ITEM_SUMMON_1                    = 4093,
-    GOSSIP_ITEM_SUMMON_2                    = 4109,
-    GOSSIP_ITEM_SUMMON_3                    = 4108,
+    MENU_ID_RAGNAROS_SUMMON                 = 4108,
 
     FACTION_MAJORDOMO_FRIENDLY              = 1080,
     SUMMON_GROUP_ADDS                       = 1,
@@ -507,48 +501,14 @@ struct boss_majordomo : public BossAI
         }
     }
 
-    void sGossipHello(Player* player) override
+    void sGossipSelect(Player* player, uint32 menuId, uint32 /*gossipListId*/) override
     {
-        ClearGossipMenuFor(player);
-        AddGossipItemFor(player, GOSSIP_ITEM_SUMMON_1, 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
-        SendGossipMenuFor(player, TEXT_ID_SUMMON_1, me->GetGUID());
-    }
-
-    void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
-    {
-        uint32 const action = player->PlayerTalkClass->GetGossipOptionAction(gossipListId);
-        ClearGossipMenuFor(player);
-        switch (action)
+        if (menuId == MENU_ID_RAGNAROS_SUMMON)
         {
-            case GOSSIP_ACTION_INFO_DEF:
-            {
-                AddGossipItemFor(player, GOSSIP_ITEM_SUMMON_2, 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-                SendGossipMenuFor(player, TEXT_ID_SUMMON_2, me->GetGUID());
-                break;
-            }
-            case GOSSIP_ACTION_INFO_DEF+1:
-            {
-                AddGossipItemFor(player, GOSSIP_ITEM_SUMMON_2, 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-                SendGossipMenuFor(player, TEXT_ID_SUMMON_2, me->GetGUID());
-                break;
-            }
-            case GOSSIP_ACTION_INFO_DEF+2:
-            {
-                AddGossipItemFor(player, GOSSIP_ITEM_SUMMON_3, 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-                SendGossipMenuFor(player, TEXT_ID_SUMMON_3, me->GetGUID());
-                break;
-            }
-            case GOSSIP_ACTION_INFO_DEF+3:
-            {
-                CloseGossipMenuFor(player);
-                me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
-                Talk(SAY_RAG_SUM_1, player);
-                DoAction(ACTION_START_RAGNAROS_INTRO);
-                break;
-            }
-            default:
-                CloseGossipMenuFor(player);
-                break;
+            CloseGossipMenuFor(player);
+            me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
+            Talk(SAY_RAG_SUM_1, player);
+            DoAction(ACTION_START_RAGNAROS_INTRO);
         }
     }
 

src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp

@@ -688,14 +688,14 @@ class npc_gunship : public CreatureScript
             if (_instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != IN_PROGRESS)
                 return;
 
+            // Blizzlike: ship wipes when all players are in cannons (vehicles) with nobody on deck
+            // See: azerothcore/azerothcore-wotlk#17856
             bool playerOnDeck = false;
             me->GetMap()->DoForAllPlayers([&](Player* player)
                 {
                     if (!player->GetVehicle() && player->IsAlive())
                         playerOnDeck = true;
                 });
-
-            // Wipe if no player is on the deck
             if (!playerOnDeck)
             {
                 // Script runs on enemy ship. We want to kill our ship.

src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp

@@ -653,6 +653,8 @@ class boss_the_lich_king : public CreatureScript
             _lastTalkTimeBuff = 0;
             _bFrostmournePhase = false;
             _bFordringMustFallYell = false;
+            me->SetRegeneratingHealth(true);
+            me->SetIsCombatDisallowed(false);
 
             _Reset();
             DoAction(ACTION_RESTORE_LIGHT);
@@ -792,12 +794,15 @@ class boss_the_lich_king : public CreatureScript
             if (_phase == PHASE_THREE && HealthBelowPct(10) && !me->HasUnitState(UNIT_STATE_CASTING))
             {
                 _phase = PHASE_OUTRO;
+                me->SetRegeneratingHealth(false);
+                me->SetIsCombatDisallowed(true);
                 EntryCheckPredicate pred(NPC_STRANGULATE_VEHICLE);
                 summons.DoAction(ACTION_TELEPORT_BACK, pred);
                 events.Reset();
                 summons.DespawnAll();
                 me->SetReactState(REACT_PASSIVE);
                 me->AttackStop();
+                me->CombatStop(true);
                 me->GetMap()->SetZoneMusic(AREA_THE_FROZEN_THRONE, MUSIC_FURY_OF_FROSTMOURNE);
                 me->InterruptNonMeleeSpells(true);
                 me->CastSpell((Unit*)nullptr, SPELL_FURY_OF_FROSTMOURNE, false);
@@ -1253,6 +1258,9 @@ class boss_the_lich_king : public CreatureScript
 
         void EnterEvadeMode(EvadeReason why) override
         {
+            if (_phase == PHASE_OUTRO || _phase == PHASE_FROSTMOURNE)
+                return;
+
             EntryCheckPredicate pred(NPC_STRANGULATE_VEHICLE);
             summons.DoAction(ACTION_TELEPORT_BACK, pred);
             instance->SetBossState(DATA_THE_LICH_KING, FAIL);