merge

--HG--
branch : trunk

1 files changed, 3 insertions, 0 deletions

diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
index a884db5dc0f..ed742c9368b 100644
--- a/src/game/GameEventMgr.cpp
+++ b/src/game/GameEventMgr.cpp
@@ -1283,7 +1283,10 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
                 Creature* pCreature = new Creature;
                 //sLog.outDebug("Spawning creature %u",*itr);
                 if (!pCreature->LoadFromDB(*itr, map))
+                {
+                    pCreature->CleanupsBeforeDelete();
                     delete pCreature;
+                }
                 else
                     map->Add(pCreature);
             }