From 076016836e950dda00fe060cddbea5304ead0fd6 Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Sat, 16 May 2026 11:41:24 -0500 Subject: [PATCH] fix(Core/Player): preserve extra_flags when GM-state restore gate skips (#25861) Co-authored-by: blinkysc --- src/server/game/Entities/Player/PlayerStorage.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/server/game/Entities/Player/PlayerStorage.cpp b/src/server/game/Entities/Player/PlayerStorage.cpp index 51ff08982..ea1d6fede 100644 --- a/src/server/game/Entities/Player/PlayerStorage.cpp +++ b/src/server/game/Entities/Player/PlayerStorage.cpp @@ -5400,6 +5400,11 @@ bool Player::LoadFromDB(ObjectGuid playerGuid, CharacterDatabaseQueryHolder cons uint32 extraflags = fields[36].Get(); + // 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(), holder.GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_PET_SLOTS)); m_atLoginFlags = fields[38].Get();