*Merge.

--HG-- branch : trunk
2009-03-25 16:00:38 -06:00
parent 53cce67b29 581ae2719d
commit 312b8e5b73
7 changed files with 35 additions and 30 deletions
@@ -155,12 +155,16 @@ m_creatureInfo(NULL), m_reactState(REACT_AGGRESSIVE), m_formationID(0), m_summon

 Creature::~Creature()
 {
-    CleanupsBeforeDelete();
-
    m_vendorItemCounts.clear();

-    delete i_AI;
-    i_AI = NULL;
+    if(i_AI)
+    {
+        delete i_AI;
+        i_AI = NULL;
+    }
+
+    if(m_uint32Values)
+        sLog.outDetail("Deconstruct Creature Entry = %u", GetEntry());
 }

 void Creature::AddToWorld()