public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 07:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Battlefield): fire OnBattlefieldPlayerLeaveZone before HasPlayer guard (#25870)

Browse Source 
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Andrew
2026-05-16 20:22:14 -03:00
committed by GitHub
parent d45e01e1ea
commit ac12f5d27c
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/game/Battlefield/Battlefield.cpp
View File

@@ -129,17 +129,16 @@ void Battlefield::HandlePlayerLeaveZone(Player* player, uint32 /*zone*/)
for (BfCapturePoint* cp : CapturePoints) for (BfCapturePoint* cp : CapturePoints)
cp->HandlePlayerLeave(player); cp->HandlePlayerLeave(player);
InvitedPlayers[player->GetTeamId()].erase(player->GetGUID()); for (uint8 i = 0; i < PVP_TEAMS_COUNT; ++i)
PlayersInQueue[player->GetTeamId()].erase(player->GetGUID()); {
PlayersWillBeKick[player->GetTeamId()].erase(player->GetGUID()); InvitedPlayers[i].erase(player->GetGUID());
Players[player->GetTeamId()].erase(player->GetGUID()); PlayersInQueue[i].erase(player->GetGUID());
PlayersWillBeKick[i].erase(player->GetGUID());
Players[i].erase(player->GetGUID());
}
SendRemoveWorldStates(player); SendRemoveWorldStates(player);
RemovePlayerFromResurrectQueue(player->GetGUID()); RemovePlayerFromResurrectQueue(player->GetGUID());
OnPlayerLeaveZone(player); 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) bool Battlefield::Update(uint32 diff)
@@ -379,7 +378,10 @@ void Battlefield::DoPlaySoundToAll(uint32 soundId)
bool Battlefield::HasPlayer(Player* player) const 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 // Called in WorldSession::HandleBfQueueInviteResponse

2
src/server/game/Battlefield/BattlefieldMgr.cpp
View File

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