From 8db10c67d7232b7b1e479018cfbf020a3a91fa5c Mon Sep 17 00:00:00 2001 From: Treeston Date: Sat, 9 Sep 2017 21:32:21 +0200 Subject: 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) --- src/server/game/Entities/Player/Player.cpp | 4 ++-- 1 file changed, 2 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 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()) { -- cgit v1.2.3