diff options
author | Treeston <treeston.mmoc@gmail.com> | 2017-09-09 21:32:21 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2020-08-23 22:36:00 +0200 |
commit | 8db10c67d7232b7b1e479018cfbf020a3a91fa5c (patch) | |
tree | 4b7db9ae7aa82f79c06eca233f4b596ea7fc61e8 /src | |
parent | e856bedd92940234ec744d51706f9ddd1255ea73 (diff) |
Core/Player: Update map zone stats BEFORE invoking scripts. Fixes a crash with zone change scripts that invoke another zone change. Closes #20289.
(cherry picked from commit dbabcfbe245738bebd7400ae8b4dd9f6410e9b9c)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 29b48a31f37..5f3ac41c690 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7153,6 +7153,8 @@ void Player::UpdateArea(uint32 newArea) void Player::UpdateZone(uint32 newZone, uint32 newArea) { + GetMap()->UpdatePlayerZoneStats(m_zoneUpdateId, newZone); + if (m_zoneUpdateId != newZone) { sOutdoorPvPMgr->HandlePlayerLeaveZone(this, m_zoneUpdateId); @@ -7164,8 +7166,6 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea) guild->UpdateMemberData(this, GUILD_MEMBER_DATA_ZONEID, newZone); } - GetMap()->UpdatePlayerZoneStats(m_zoneUpdateId, newZone); - // group update if (GetGroup()) { |