diff options
Diffstat (limited to 'src/server/game/Maps/MapManager.cpp')
| -rw-r--r-- | src/server/game/Maps/MapManager.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index f9ca9526adb..e59e0cea265 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -156,10 +156,6 @@ Map::EnterState MapManager::PlayerCannotEnter(uint32 mapid, Player* player, bool if (!entry->IsDungeon()) return Map::CAN_ENTER; - InstanceTemplate const* instance = sObjectMgr->GetInstanceTemplate(mapid); - if (!instance) - return Map::CANNOT_ENTER_UNINSTANCED_DUNGEON; - Difficulty targetDifficulty, requestedDifficulty; targetDifficulty = requestedDifficulty = player->GetDifficultyID(entry); // Get the highest available difficulty if current setting is higher than the instance allows @@ -266,16 +262,9 @@ bool MapManager::ExistMapAndVMap(uint32 mapid, float x, float y) return Map::ExistMap(mapid, gx, gy) && Map::ExistVMap(mapid, gx, gy); } -bool MapManager::IsValidMAP(uint32 mapid, bool startUp) +bool MapManager::IsValidMAP(uint32 mapId) { - MapEntry const* mEntry = sMapStore.LookupEntry(mapid); - - if (startUp) - return mEntry ? true : false; - else - return mEntry && (!mEntry->IsDungeon() || sObjectMgr->GetInstanceTemplate(mapid)); - - /// @todo add check for battleground template + return sMapStore.LookupEntry(mapId) != nullptr; } void MapManager::UnloadAll() |