aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MovementHandler.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2022-05-14 20:40:24 +0200
committerShauren <shauren.trinity@gmail.com>2022-05-14 20:40:24 +0200
commit25c0aaa83fede6cd5214da00bb08a21c0b28c4be (patch)
tree2ba5f8d0fa8f162fe2fd50b4b7e7faa89e96bf81 /src/server/game/Handlers/MovementHandler.cpp
parent19b052d939ade28e95a6aed405a620a6ee966af8 (diff)
Core/Players: Allow teleporting to a specific instance id
Diffstat (limited to 'src/server/game/Handlers/MovementHandler.cpp')
-rw-r--r--src/server/game/Handlers/MovementHandler.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index c1209c0f7a7..d680550483c 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -75,7 +75,9 @@ void WorldSession::HandleMoveWorldportAck()
player->m_InstanceValid = true;
Map* oldMap = player->GetMap();
- Map* newMap = sMapMgr->CreateMap(loc.GetMapId(), player);
+ Map* newMap = GetPlayer()->GetTeleportDestInstanceId() ?
+ sMapMgr->FindMap(loc.GetMapId(), *GetPlayer()->GetTeleportDestInstanceId()) :
+ sMapMgr->CreateMap(loc.GetMapId(), GetPlayer());
if (player->IsInWorld())
{