Revert 2f83db28f2a11384e1b818b1d5d42d0d87111172. Note that here we only want to check baseMap->canEnter, but not instanceMap->canEnter.

Thanks to SignFinder.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index bf68ec34b9d..84182ad1d25 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