From 431e6027c69aea9a700732188ea68337298e02ec Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 10 Feb 2019 17:58:23 +0100 Subject: [PATCH] Core/Spells: restore the pointer check for grid maps to make sure that we will never see a nullpointer ever again --- src/server/game/Maps/Map.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 5f9c3f2be8..22c19d7b90 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2430,7 +2430,7 @@ GridMap* Map::GetGrid(uint32 mapId, float x, float y) GridMap* grid = GridMaps[gx][gy]; auto childMapItr = std::find_if(m_childTerrainMaps->begin(), m_childTerrainMaps->end(), [mapId](Map* childTerrainMap) { return childTerrainMap->GetId() == mapId; }); - if (childMapItr != m_childTerrainMaps->end() && (*childMapItr)->GridMaps[gx][gy]->fileExists()) + if (childMapItr != m_childTerrainMaps->end() && (*childMapItr)->GridMaps[gx][gy] && (*childMapItr)->GridMaps[gx][gy]->fileExists()) grid = (*childMapItr)->GridMaps[gx][gy]; return grid;