summaryrefslogtreecommitdiff
path: root/src/game-server/mapmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game-server/mapmanager.cpp')
-rw-r--r--src/game-server/mapmanager.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game-server/mapmanager.cpp b/src/game-server/mapmanager.cpp
index de752c00..3044d350 100644
--- a/src/game-server/mapmanager.cpp
+++ b/src/game-server/mapmanager.cpp
@@ -102,8 +102,7 @@ void MapManager::deinitialize()
MapComposite *MapManager::getMap(int mapId)
{
Maps::iterator i = maps.find(mapId);
- assert(i != maps.end());
- return i->second;
+ return (i != maps.end()) ? i->second : NULL;
}
void MapManager::raiseActive(int mapId)