From 0e76b4ab9dae9547a1b8e56014affd8bda230dbd Mon Sep 17 00:00:00 2001 From: Gildor Date: Fri, 20 Jan 2023 17:33:21 +0100 Subject: Core/Battlegrounds: Prevent end Arena when a dead player logout (#28766) (cherry picked from commit aeb4d18e20c444e828ecff0964013d3d8daf67d9) --- src/server/game/Battlegrounds/Battleground.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 00f03068dc0..0bca373d715 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -1218,8 +1218,8 @@ void Battleground::EventPlayerLoggedOut(Player* player) // drop flag and handle other cleanups RemovePlayer(player, guid, GetPlayerTeam(guid)); - // 1 player is logging out, if it is the last, then end arena! - if (isArena()) + // 1 player is logging out, if it is the last alive, then end arena! + if (isArena() && player->IsAlive()) if (GetAlivePlayersCountByTeam(player->GetBGTeam()) <= 1 && GetPlayersCountByTeam(GetOtherTeam(player->GetBGTeam()))) EndBattleground(GetOtherTeam(player->GetBGTeam())); } -- cgit v1.2.3