From 78577afa4900a0b83c9f33e5f94f15f9f51de8c7 Mon Sep 17 00:00:00 2001 From: sirikfoll Date: Wed, 17 Jan 2018 18:59:20 -0200 Subject: Core/Player: Pass correct Zone ID to HandlePlayerLeaveZone This will fix some issues with Wintergrasp, like phasing auras getting stuck and missing group invites for the battle, among others (cherry picked from commit ed9e220991e2aa3fa2d50359608fd27057cafbbc) --- src/server/game/Entities/Player/Player.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 4908d94473f..6246594485a 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7196,6 +7196,7 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea) { if (!IsInWorld()) return; + uint32 const oldZone = m_zoneUpdateId; m_zoneUpdateId = newZone; m_zoneUpdateTimer = ZONE_UPDATE_INTERVAL; @@ -7205,8 +7206,8 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea) // call leave script hooks immedately (before updating flags) if (oldZone != newZone) { - sOutdoorPvPMgr->HandlePlayerLeaveZone(this, m_zoneUpdateId); - sBattlefieldMgr->HandlePlayerLeaveZone(this, m_zoneUpdateId); + sOutdoorPvPMgr->HandlePlayerLeaveZone(this, oldZone); + sBattlefieldMgr->HandlePlayerLeaveZone(this, oldZone); } // group update -- cgit v1.2.3