From 43e16de51437734962aade6f87f440c8366157c7 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Thu, 28 May 2026 22:37:06 -0300 Subject: [PATCH] fix(Core/Wintergrasp): disband raid groups on battle end (#26014) Co-authored-by: Xfurry Co-authored-by: Claude Opus 4.7 (1M context) --- src/server/game/Battlefield/Battlefield.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index 0492d9e0a2..9381fd1284 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -407,6 +407,14 @@ void Battlefield::EndBattle(bool endByTimer) OnBattleEnd(endByTimer); sScriptMgr->OnBattlefieldWarEnd(this, endByTimer); + for (uint8 team = 0; team < PVP_TEAMS_COUNT; ++team) + { + for (ObjectGuid const& guid : Groups[team]) + if (Group* group = sGroupMgr->GetGroupByGUID(guid.GetCounter())) + group->Disband(); + Groups[team].clear(); + } + // Reset battlefield timer Timer = NoWarBattleTime; SendInitWorldStatesToAll();