From 529af3cd092972c2d5204308a5ba573bad8e0b1f Mon Sep 17 00:00:00 2001
From: megamage <none@none.none>
Date: Mon, 28 Nov 2011 14:05:25 -0500
Subject: Delete obj if it is not successfully added to grid. More to fix.

---
 src/server/game/Pools/PoolMgr.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/server/game/Pools/PoolMgr.cpp')

diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
index bd8840ff8a8..96bb4a211eb 100755
--- a/src/server/game/Pools/PoolMgr.cpp
+++ b/src/server/game/Pools/PoolMgr.cpp
@@ -365,13 +365,11 @@ void PoolGroup<Creature>::Spawn1Object(PoolObject* obj)
         {
             Creature* creature = new Creature;
             //sLog->outDebug(LOG_FILTER_POOLSYS, "Spawning creature %u", guid);
-            if (!creature->LoadFromDB(obj->guid, map))
+            if (!creature->LoadCreatureFromDB(obj->guid, map))
             {
                 delete creature;
                 return;
             }
-            else
-                map->AddToMap(creature);
         }
     }
 }
@@ -391,7 +389,7 @@ void PoolGroup<GameObject>::Spawn1Object(PoolObject* obj)
         {
             GameObject* pGameobject = new GameObject;
             //sLog->outDebug(LOG_FILTER_POOLSYS, "Spawning gameobject %u", guid);
-            if (!pGameobject->LoadFromDB(obj->guid, map))
+            if (!pGameobject->LoadGameObjectFromDB(obj->guid, map, false))
             {
                 delete pGameobject;
                 return;
-- 
cgit v1.2.3