From 3fbb657e3bf217f4ebb60992e601ed621720249f Mon Sep 17 00:00:00 2001 From: LihO Date: Thu, 4 Aug 2011 19:41:11 +0200 Subject: Core/Maps : Crash fix Closes #1489 --- src/server/game/Maps/Map.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/Maps') 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); -- cgit v1.2.3