aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2017-10-26 11:35:06 +0200
committerTreeston <treeston.mmoc@gmail.com>2017-10-26 11:35:21 +0200
commitbf81a7b207b28d0a873cc9e3f2ece6a322d80256 (patch)
tree2ee75cce4cb1d08db011ed162ed3dd28d6868dbd
parent37995ade2991ed27845728eb6a6dd95f3a490849 (diff)
Core/Map: Fix a crash bug when teleporting out of map before being fully added to that map. Closes #20289.
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 869cb2faf16..96e3cad3d7c 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -6995,6 +6995,8 @@ void Player::UpdateArea(uint32 newArea)
void Player::UpdateZone(uint32 newZone, uint32 newArea)
{
+ if (!IsInWorld())
+ return;
uint32 const oldZone = m_zoneUpdateId;
m_zoneUpdateId = newZone;
m_zoneUpdateTimer = ZONE_UPDATE_INTERVAL;