aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2017-10-26 11:35:06 +0200
committerfunjoker <funjoker109@gmail.com>2021-01-13 22:04:52 +0100
commit6a69dcced2e5bb6227eff28c48c4636cfdb23a1e (patch)
tree5284ee2130d7db8128d55000d2ff9ac4162e2abc
parent097335f2c4db5ce8ff773ec73b179a1f26b504fe (diff)
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)
-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 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;