1 files changed, 10 insertions, 40 deletions

diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
index 15a3f427ccd..63326d8ab84 100644
--- a/src/server/game/Grids/ObjectGridLoader.cpp
+++ b/src/server/game/Grids/ObjectGridLoader.cpp
@@ -119,49 +119,19 @@ void LoadHelper(CellGuidSet const& guid_set, CellCoord &cell, GridRefManager<T>
 {
     for (CellGuidSet::const_iterator i_guid = guid_set.begin(); i_guid != guid_set.end(); ++i_guid)
     {
-        T* obj = new T;
+        // Don't spawn at all if there's a respawn timer
+        ObjectGuid::LowType guid = *i_guid;
+        if (!map->ShouldBeSpawnedOnGridLoad<T>(guid))
+            continue;
 
-        // Don't spawn at all if there's a respawn time
-        if ((obj->GetTypeId() == TYPEID_UNIT && !map->GetCreatureRespawnTime(*i_guid)) || (obj->GetTypeId() == TYPEID_GAMEOBJECT && !map->GetGORespawnTime(*i_guid)))
+        T* obj = new T;
+        //TC_LOG_INFO("misc", "DEBUG: LoadHelper from table: %s for (guid: %u) Loading", table, guid);
+        if (!obj->LoadFromDB(guid, map, false, false))
         {
-            ObjectGuid::LowType guid = *i_guid;
-            //TC_LOG_INFO("misc", "DEBUG: LoadHelper from table: %s for (guid: %u) Loading", table, guid);
-
-            if (obj->GetTypeId() == TYPEID_UNIT)
-            {
-                CreatureData const* cdata = sObjectMgr->GetCreatureData(guid);
-                ASSERT(cdata, "Tried to load creature with spawnId %u, but no such creature exists.", guid);
-                SpawnGroupTemplateData const* const group = cdata->spawnGroupData;
-                // If creature in manual spawn group, don't spawn here, unless group is already active.
-                if (!(group->flags & SPAWNGROUP_FLAG_SYSTEM))
-                    if (!map->IsSpawnGroupActive(group->groupId))
-                    {
-                        delete obj;
-                        continue;
-                    }
-            }
-            else if (obj->GetTypeId() == TYPEID_GAMEOBJECT)
-            {
-                // If gameobject in manual spawn group, don't spawn here, unless group is already active.
-                GameObjectData const* godata = sObjectMgr->GetGameObjectData(guid);
-                ASSERT(godata, "Tried to load gameobject with spawnId %u, but no such object exists.", guid);
-                if (!(godata->spawnGroupData->flags & SPAWNGROUP_FLAG_SYSTEM))
-                    if (!map->IsSpawnGroupActive(godata->spawnGroupData->groupId))
-                    {
-                        delete obj;
-                        continue;
-                    }
-            }
-
-            if (!obj->LoadFromDB(guid, map, false, false))
-            {
-                delete obj;
-                continue;
-            }
-            AddObjectHelper(cell, m, count, map, obj);
-        }
-        else
             delete obj;
+            continue;
+        }
+        AddObjectHelper(cell, m, count, map, obj);
     }
 }