aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/Map.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
-rwxr-xr-xsrc/server/game/Maps/Map.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index e3ab09ed426..4cde2913160 100755
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -544,7 +544,7 @@ void Map::Update(const uint32 t_diff)
{
Player* plr = m_mapRefIter->getSource();
- if (!plr->IsInWorld())
+ if (!plr || !plr->IsInWorld())
continue;
// update players at tick
@@ -559,7 +559,7 @@ void Map::Update(const uint32 t_diff)
WorldObject* obj = *m_activeNonPlayersIter;
++m_activeNonPlayersIter;
- if (!obj->IsInWorld())
+ if (!obj || !obj->IsInWorld())
continue;
VisitNearbyCellsOf(obj, grid_object_update, world_object_update);