From 25c0aaa83fede6cd5214da00bb08a21c0b28c4be Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 14 May 2022 20:40:24 +0200 Subject: Core/Players: Allow teleporting to a specific instance id --- src/server/game/Handlers/MovementHandler.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/server/game/Handlers/MovementHandler.cpp') 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()) { -- cgit v1.2.3