Core/AreaTriggers: Code cleanup

2 files changed, 4 insertions, 5 deletions

diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
index 9ab947aac18..514c73d2358 100644
--- a/src/server/game/Grids/ObjectGridLoader.cpp
+++ b/src/server/game/Grids/ObjectGridLoader.cpp
@@ -192,13 +192,12 @@ void ObjectGridLoader::Visit(CreatureMapType &m)
     LoadHelper(cell_guids.creatures, cellCoord, m, i_creatures, i_map);
 }
 
-void ObjectGridLoader::Visit(AreaTriggerMapType &m)
+void ObjectGridLoader::Visit(AreaTriggerMapType& m)
 {
     CellCoord cellCoord = i_cell.GetCellCoord();
     CellGuidSet const* areaTriggers = sAreaTriggerDataStore->GetAreaTriggersForMapAndCell(i_map->GetId(), cellCoord.GetId());
-    if (!areaTriggers)
-        return;
-    LoadHelper(*areaTriggers, cellCoord, m, i_areaTriggers, i_map);
+    if (areaTriggers)
+        LoadHelper(*areaTriggers, cellCoord, m, i_areaTriggers, i_map);
 }
 
 void ObjectWorldLoader::Visit(CorpseMapType& /*m*/)
diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
index c33f372697c..e88a2813d93 100644
--- a/src/server/game/Grids/ObjectGridLoader.h
+++ b/src/server/game/Grids/ObjectGridLoader.h
@@ -32,7 +32,7 @@ class TC_GAME_API ObjectGridLoader
 
     public:
         ObjectGridLoader(NGridType& grid, Map* map, Cell const& cell)
-            : i_cell(cell), i_grid(grid), i_map(map), i_gameObjects(0), i_creatures(0), i_corpses (0)
+            : i_cell(cell), i_grid(grid), i_map(map), i_gameObjects(0), i_creatures(0), i_corpses(0), i_areaTriggers(0)
             { }
 
         void Visit(GameObjectMapType &m);