From 6a69dcced2e5bb6227eff28c48c4636cfdb23a1e Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Thu, 26 Oct 2017 11:35:06 +0200
Subject: Core/Map: Fix a crash bug when teleporting out of map before being
 fully added to that map. Closes #20289.

(cherry picked from commit bf81a7b207b28d0a873cc9e3f2ece6a322d80256)
---
 src/server/game/Entities/Player/Player.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 18cec686cc5..c1fd2dd26f3 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -7088,6 +7088,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;
-- 
cgit v1.2.3