From 0eb193f2b416af7f34bd89641aec88d843c9197e Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 23 Nov 2011 12:55:00 -0500 Subject: [PATCH] Revert 2f83db28f2a11384e1b818b1d5d42d0d87111172. Note that here we only want to check baseMap->canEnter, but not instanceMap->canEnter. Thanks to SignFinder. --- src/server/game/Entities/Player/Player.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index bf68ec34b9..84182ad1d2 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2205,7 +2205,9 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati if (!sMapMgr->CanPlayerEnter(mapid, this, false)) return false; - Map* map = sMapMgr->CreateMap(mapid, this); + // If the map is not created, assume it is possible to enter it. + // It will be created in the WorldPortAck. + Map* map = sMapMgr->FindBaseMap(mapid); if (!map || map->CanEnter(this)) { //lets reset near teleport flag if it wasn't reset during chained teleports