diff options
Diffstat (limited to 'src/server/game/Handlers/MovementHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MovementHandler.cpp | 4 |
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()) { |