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

Thanks to SignFinder.
2011-11-23 12:55:00 -05:00
parent 5a0ffefecc
commit 0eb193f2b4
1 changed files with 3 additions and 1 deletions
@@ -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