Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]

Author: github-actions[bot]

data/sql/updates/db_world/2026_06_12_00.sql

@@ -0,0 +1,5 @@
+-- DB update 2026_06_11_02 -> 2026_06_12_00
+-- DB update 2026_06_11_02 -> 2026_06_11_03
+-- Spell (ID: 30213) was added to spell_cone in 2026_06_11_02 but does not have
+-- a cone implicit target, causing a server warning on startup.
+DELETE FROM `spell_cone` WHERE `ID` = 30213;

data/sql/updates/db_world/2026_06_12_01.sql

@@ -0,0 +1,6 @@
+-- DB update 2026_06_12_00 -> 2026_06_12_01
+--
+-- Remove "We made it! Thank you for getting me out of that hell hole. Tell Hemet to expect me!"
+DELETE FROM `creature_text` WHERE (`CreatureID` = 28787) AND `GroupID` = 0 AND `ID` = 0;
+-- Remove "Let's get the hell out of here"
+DELETE FROM `creature_text` WHERE (`CreatureID` = 28787) AND `GroupID` = 6 AND `ID` = 0;

data/sql/updates/db_world/2026_06_12_02.sql

@@ -0,0 +1,4 @@
+-- DB update 2026_06_12_01 -> 2026_06_12_02
+DELETE FROM `creature_loot_template` WHERE `Entry` = 31610 AND `Item` = 41796;
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(31610, 41796, 0, 100, 0, 1, 0, 1, 1, 'Anub\'arak (1) - Design: Infused Twilight Opal');

src/server/game/Battlefield/Battlefield.cpp

@@ -97,7 +97,8 @@ void Battlefield::HandlePlayerEnterZone(Player* player, uint32 /*zone*/)
     TryRejoinAfterLogout(player); // relog: auto-rejoin, skip invite below
 
     // Xinef: do not invite players on taxi
-    if (!player->IsInFlight())
+    // GMs are not invited to war (see InvitePlayerToWar), so skip queue and slot tracking too
+    if (!player->IsInFlight() && !player->IsGameMaster())
     {
         // If battle is started,
         // If not full of players > invite player to join the war
@@ -109,7 +110,7 @@ void Battlefield::HandlePlayerEnterZone(Player* player, uint32 /*zone*/)
             else
             {
                 /// @todo: Send a packet to announce it to player
-                PlayersWillBeKick[player->GetTeamId()][player->GetGUID()] = GameTime::GetGameTime().count() + (player->IsGameMaster() ? 30 * MINUTE : 10);
+                PlayersWillBeKick[player->GetTeamId()][player->GetGUID()] = GameTime::GetGameTime().count() + 10;
                 InvitePlayerToQueue(player);
             }
         }
@@ -214,6 +215,9 @@ void Battlefield::InvitePlayersInZoneToQueue()
 
 void Battlefield::InvitePlayerToQueue(Player* player)
 {
+    if (player->IsGameMaster()) // GMs are not invited to war, so don't queue them either
+        return;
+
     if (PlayersInQueue[player->GetTeamId()].count(player->GetGUID()))
         return;
 
@@ -238,6 +242,10 @@ void Battlefield::InvitePlayersInZoneToWar()
 {
     ForEachPlayerInZone([this](Player* player)
     {
+        // Skip GMs: they are never invited, so they would linger in PlayersWillBeKick forever
+        if (player->IsGameMaster())
+            return;
+
         if (IsPlayerInWarOrInvited(player))
             return;
 

src/server/game/Battlegrounds/Arena.cpp

@@ -246,9 +246,13 @@ void Arena::EndBattleground(TeamId winnerTeamId)
             trans->Append(stmt2);
 
             uint8 memberId = 0;
-            for (auto const& [playerGuid, arenaLogEntryData] : ArenaLogEntries)
+            for (auto& [playerGuid, arenaLogEntryData] : ArenaLogEntries)
             {
                 auto const& score = PlayerScores.find(playerGuid.GetCounter());
+                // Update stats from PlayerScores if player is still in arena
+                if (score != PlayerScores.end())
+                    arenaLogEntryData.SaveStats(score->second->GetDamageDone(), score->second->GetHealingDone(), score->second->GetKillingBlows());
+
                 stmt2 = CharacterDatabase.GetPreparedStatement(CHAR_INS_ARENA_LOG_MEMBERSTATS);
                 stmt2->SetData(0, fightId);
                 stmt2->SetData(1, ++memberId);
@@ -257,18 +261,9 @@ void Arena::EndBattleground(TeamId winnerTeamId)
                 stmt2->SetData(4, arenaLogEntryData.ArenaTeamId);
                 stmt2->SetData(5, arenaLogEntryData.Acc);
                 stmt2->SetData(6, arenaLogEntryData.IP);
-                if (score != PlayerScores.end())
-                {
-                    stmt2->SetData(7, score->second->GetDamageDone());
-                    stmt2->SetData(8, score->second->GetHealingDone());
-                    stmt2->SetData(9, score->second->GetKillingBlows());
-                }
-                else
-                {
-                    stmt2->SetData(7, 0);
-                    stmt2->SetData(8, 0);
-                    stmt2->SetData(9, 0);
-                }
+                stmt2->SetData(7, arenaLogEntryData.DamageDone);
+                stmt2->SetData(8, arenaLogEntryData.HealingDone);
+                stmt2->SetData(9, arenaLogEntryData.KillingBlows);
                 trans->Append(stmt2);
             }
 

src/server/game/Battlegrounds/Battleground.cpp

@@ -1080,6 +1080,11 @@ void Battleground::RemovePlayerAtLeave(Player* player)
     auto const& itr2 = PlayerScores.find(player->GetGUID().GetCounter());
     if (itr2 != PlayerScores.end())
     {
+        // Save stats to ArenaLogEntries before deleting score (for arena logging)
+        auto itr3 = ArenaLogEntries.find(player->GetGUID());
+        if (itr3 != ArenaLogEntries.end())
+            itr3->second.SaveStats(itr2->second->GetDamageDone(), itr2->second->GetHealingDone(), itr2->second->GetKillingBlows());
+
         delete itr2->second;
         PlayerScores.erase(itr2);
     }

src/server/game/Battlegrounds/Battleground.h

@@ -258,11 +258,21 @@ class ArenaLogEntryData
         IP = ip;
     }
 
+    void SaveStats(uint32 damageDone, uint32 healingDone, uint32 killingBlows)
+    {
+        DamageDone = damageDone;
+        HealingDone = healingDone;
+        KillingBlows = killingBlows;
+    }
+
     std::string Name{};
     ObjectGuid::LowType Guid{0};
     uint32 Acc{0};
     uint32 ArenaTeamId{0};
     std::string IP{};
+    uint32 DamageDone{0};
+    uint32 HealingDone{0};
+    uint32 KillingBlows{0};
 };
 
 enum BGHonorMode