aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsirikfoll <sirikfoll@hotmail.com>2018-01-17 18:59:20 -0200
committersirikfoll <sirikfoll@hotmail.com>2018-01-17 18:59:20 -0200
commited9e220991e2aa3fa2d50359608fd27057cafbbc (patch)
tree30f3583daec5f839611538d4a6d7f9184aac9319
parentfb8885fabc04d9252ead8369159104b8a1cb43da (diff)
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
-rw-r--r--src/server/game/Entities/Player/Player.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 7fc57c2f305..ebd2397746a 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -6998,6 +6998,7 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
{
if (!IsInWorld())
return;
+
uint32 const oldZone = m_zoneUpdateId;
m_zoneUpdateId = newZone;
m_zoneUpdateTimer = ZONE_UPDATE_INTERVAL;
@@ -7007,8 +7008,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