sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Arenas): correct BG status on Arena leave (#7323)

Browse Source 
- Closes #7278
This commit is contained in:
UltraNix
2021-08-23 20:18:36 +02:00
committed by GitHub
parent cd539189ea
commit 39efbb736f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/Battleground.cpp
+5 -2
View File
@@ -1105,6 +1105,9 @@ void Battleground::RemovePlayerAtLeave(Player* player)
player->RemoveAurasByType(SPELL_AURA_MOUNTED); player->RemoveAurasByType(SPELL_AURA_MOUNTED);
// GetStatus might be changed in RemovePlayer - define it here
BattlegroundStatus status = GetStatus();
// BG subclass specific code // BG subclass specific code
RemovePlayer(player); RemovePlayer(player);
@@ -1116,7 +1119,7 @@ void Battleground::RemovePlayerAtLeave(Player* player)
player->ClearAfkReports(); player->ClearAfkReports();
//left a rated match in progress, consider as loser //left a rated match in progress, consider as loser
if (isArena() && isRated() && GetStatus() == STATUS_IN_PROGRESS && teamId != TEAM_NEUTRAL) if (isArena() && isRated() && status == STATUS_IN_PROGRESS && teamId != TEAM_NEUTRAL)
{ {
ArenaTeam* winnerArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(GetOtherTeamId(teamId))); ArenaTeam* winnerArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(GetOtherTeamId(teamId)));
ArenaTeam* loserArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(teamId)); ArenaTeam* loserArenaTeam = sArenaTeamMgr->GetArenaTeamById(GetArenaTeamIdForTeam(teamId));
@@ -1139,7 +1142,7 @@ void Battleground::RemovePlayerAtLeave(Player* player)
// cast deserter // cast deserter
if (isBattleground() && !player->IsGameMaster() && sWorld->getBoolConfig(CONFIG_BATTLEGROUND_CAST_DESERTER)) if (isBattleground() && !player->IsGameMaster() && sWorld->getBoolConfig(CONFIG_BATTLEGROUND_CAST_DESERTER))
if (GetStatus() == STATUS_IN_PROGRESS || GetStatus() == STATUS_WAIT_JOIN) if (status == STATUS_IN_PROGRESS || status == STATUS_WAIT_JOIN)
player->ScheduleDelayedOperation(DELAYED_SPELL_CAST_DESERTER); player->ScheduleDelayedOperation(DELAYED_SPELL_CAST_DESERTER);
} }