Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]

Author: github-actions[bot]

apps/docker/Dockerfile

@@ -1,4 +1,4 @@
-ARG UBUNTU_VERSION=22.04 # lts
+ARG UBUNTU_VERSION=24.04 # lts
 
 # This target lays out the general directory skeleton for AzerothCore,
 # This target isn't intended to be directly used
@@ -67,7 +67,7 @@ RUN apt-get update                                                     \
         build-essential ccache libtool cmake-data make cmake clang    \
         git lsb-base curl unzip default-mysql-client openssl                  \
         default-libmysqlclient-dev libboost-all-dev libssl-dev libmysql++-dev \
-        libreadline-dev zlib1g-dev libbz2-dev libncurses5-dev         \
+        libreadline-dev zlib1g-dev libbz2-dev libncurses5-dev liblzma-dev  \
     && rm -rf /var/lib/apt/lists/*
 
 COPY CMakeLists.txt /azerothcore/CMakeLists.txt
@@ -117,22 +117,26 @@ ARG DOCKER_USER=acore
 ENV ACORE_COMPONENT=undefined
 
 # Install base dependencies for azerothcore
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-      libmysqlclient21 libreadline8 \
-      gettext-base default-mysql-client && \
-    rm -rf /var/lib/apt/lists/*
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+      libmysqlclient21 libreadline8 libicu74 libncurses5-dev \
+      gettext-base default-mysql-client \
+      adduser \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY --from=build /azerothcore/env/dist/etc/ /azerothcore/env/ref/etc
 
 VOLUME /azerothcore/env/dist/etc
 
 ENV PATH="/azerothcore/env/dist/bin:$PATH"
 
-RUN groupadd --gid "$GROUP_ID"  "$DOCKER_USER" && \
-    useradd -d /azerothcore --uid "$USER_ID"  --gid "$GROUP_ID"  "$DOCKER_USER" && \
-    passwd -d "$DOCKER_USER" && \
-    chown -R "$DOCKER_USER:$DOCKER_USER" /azerothcore
+# To use GID/UID 1000 in ubuntu > 23.04 the existing user must be deleted
+# See https://bugs.launchpad.net/cloud-images/+bug/2005129
+RUN userdel --remove ubuntu \
+  && addgroup --gid "$GROUP_ID" "$DOCKER_USER" \
+  && adduser --disabled-password --gecos '' --uid "$USER_ID" --gid "$GROUP_ID" "$DOCKER_USER" \
+  && passwd -d "$DOCKER_USER" \
+  && chown -R "$DOCKER_USER:$DOCKER_USER" /azerothcore
 
 COPY --chown=$USER_ID:$GROUP_ID \
      --chmod=755 \

data/sql/updates/db_world/2026_05_16_00.sql

@@ -0,0 +1,5 @@
+-- DB update 2026_05_16_00 -> 2026_05_16_01
+--
+DELETE FROM `creature_text` WHERE (`CreatureID` = 24322) AND (`GroupID` IN (0));
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+    (24322, 0, 0, 'Silence!', 14, 0, 100, 1, 0, 0, 32240, 0, 'Ancient Citizen of Nifflevar yell');

data/sql/updates/db_world/2026_05_16_01.sql

@@ -0,0 +1,20 @@
+-- DB update 2026_05_16_01 -> 2026_05_16_02
+-- Update Night Elf shapeshift forms
+DELETE FROM `player_shapeshift_model` WHERE (`RaceID` = 4 AND `CustomizationID` IN (3, 5) AND `ShapeshiftID` IN (5, 8)) OR (`RaceID` = 4 AND `CustomizationID` = 5 AND `ShapeshiftID` = 1) OR (`RaceID` = 4 AND `CustomizationID` = 7 AND `ShapeshiftID` IN (5, 8)) OR (`RaceID` = 4 AND `CustomizationID` = 6 AND `ShapeshiftID` = 1);
+INSERT INTO `player_shapeshift_model` (`ShapeshiftID`, `RaceID`, `CustomizationID`, `GenderID`, `ModelID`) VALUES
+-- light blue hair, bear
+(5, 4, 3, 2, 29415),
+(8, 4, 3, 2, 29415),
+-- blue hair, bear
+(5, 4, 5, 2, 29415),
+(8, 4, 5, 2, 29415),
+-- blue hair, cat
+(1, 4, 5, 2, 29406),
+-- purple hair, red bear
+(5, 4, 7, 2, 29417),
+(8, 4, 7, 2, 29417),
+-- darkblue hair, black cat
+(1, 4, 6, 2, 892);
+
+-- remove customization id 8
+DELETE FROM `player_shapeshift_model` WHERE `ShapeshiftID`=1 AND `RaceID`=4 AND `CustomizationID`=8 AND `GenderID`=2 AND `ModelID` = 29405;

data/sql/updates/db_world/2026_05_16_02.sql

@@ -129,17 +129,16 @@ void Battlefield::HandlePlayerLeaveZone(Player* player, uint32 /*zone*/)
     for (BfCapturePoint* cp : CapturePoints)
         cp->HandlePlayerLeave(player);
 
-    InvitedPlayers[player->GetTeamId()].erase(player->GetGUID());
-    PlayersInQueue[player->GetTeamId()].erase(player->GetGUID());
-    PlayersWillBeKick[player->GetTeamId()].erase(player->GetGUID());
-    Players[player->GetTeamId()].erase(player->GetGUID());
+    for (uint8 i = 0; i < PVP_TEAMS_COUNT; ++i)
+    {
+        InvitedPlayers[i].erase(player->GetGUID());
+        PlayersInQueue[i].erase(player->GetGUID());
+        PlayersWillBeKick[i].erase(player->GetGUID());
+        Players[i].erase(player->GetGUID());
+    }
     SendRemoveWorldStates(player);
     RemovePlayerFromResurrectQueue(player->GetGUID());
     OnPlayerLeaveZone(player);
-    // Scripts must restore player->GetTeamId() here (e.g. ClearFakePlayer).
-    // All Battlefield data-structure cleanup above has already completed using
-    // the assigned team, so it is safe to restore the real team now.
-    sScriptMgr->OnBattlefieldPlayerLeaveZone(this, player);
 }
 
 bool Battlefield::Update(uint32 diff)
@@ -379,7 +378,10 @@ void Battlefield::DoPlaySoundToAll(uint32 soundId)
 
 bool Battlefield::HasPlayer(Player* player) const
 {
-    return Players[player->GetTeamId()].find(player->GetGUID()) != Players[player->GetTeamId()].end();
+    for (uint8 i = 0; i < PVP_TEAMS_COUNT; ++i)
+        if (Players[i].count(player->GetGUID()))
+            return true;
+    return false;
 }
 
 // Called in WorldSession::HandleBfQueueInviteResponse

src/server/game/Battlefield/Battlefield.cpp

@@ -17,6 +17,7 @@
 
 #include "BattlefieldMgr.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 #include "Zones/BattlefieldWG.h"
 
 BattlefieldMgr::BattlefieldMgr() : _updateTimer(0)
@@ -86,6 +87,7 @@ void BattlefieldMgr::HandlePlayerLeaveZone(Player* player, uint32 zoneId)
     // teleport: remove once in removefromworld, once in updatezone
     if (!itr->second->HasPlayer(player))
         return;
+    sScriptMgr->OnBattlefieldPlayerLeaveZone(itr->second, player);
     itr->second->HandlePlayerLeaveZone(player, zoneId);
     LOG_DEBUG("bg.battlefield", "Player {} left outdoorpvp id {}", player->GetGUID().ToString(), itr->second->GetTypeId());
 }

src/server/game/Battlefield/BattlefieldMgr.cpp

@@ -5422,6 +5422,11 @@ bool Player::LoadFromDB(ObjectGuid playerGuid, CharacterDatabaseQueryHolder cons
 
     uint32 extraflags = fields[36].Get<uint16>();
 
+    // Mirror before the gate below so saved bits survive when the gate
+    // skips effect application; otherwise the next SaveToDB writes 0
+    // over them.
+    m_ExtraFlags = extraflags;
+
     _LoadPetStable(fields[37].Get<uint8>(), holder.GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_PET_SLOTS));
 
     m_atLoginFlags = fields[38].Get<uint16>();