Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2025-04-18 22:57:30 +08:00
28 changed files with 922 additions and 74 deletions

View File

@@ -4537,7 +4537,7 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
// trigger update zone for alive state zone updates
uint32 newzone, newarea;
GetZoneAndAreaId(newzone, newarea);
UpdateZone(newzone, newarea);
UpdateZone(newzone, newarea, true);
sOutdoorPvPMgr->HandlePlayerResurrects(this, newzone);
if (Battleground* bg = GetBattleground())