Changeset 3158

Timestamp:

02/07/2010 02:33:38 PM (7 months ago)

Author:

jackpoz

Message:

FIXED: CreatureAIScript::Destroy() is called by MapCell::RemoveObjects?(), too.

Location:

trunk/src/arcemu-world

Files:

• Creature.cpp (modified) (3 diffs)
• Creature.h (modified) (1 diff)

trunk/src/arcemu-world/Creature.cpp

@@ -749 +749 @@
 }
 
+void Creature::RemoveFromWorld(bool free_guid)
+{
+        PrepareForDeletion();
+        Unit::RemoveFromWorld(free_guid);
+}
+
 void Creature::EnslaveExpire()
 {
@@ -1834 +1840 @@
         }
 
-        //remove ai stuff
-        sEventMgr.RemoveEvents( this, EVENT_CREATURE_AISPELL );
-
-        if( GetScript() != NULL )
-        {
-                GetScript()->Destroy();
-                _myScriptClass = NULL;
-        }
-
-        RemoveAllAuras();
-        
-        // If we have a summons then let's remove them
-        RemoveAllGuardians();
-        
-        // remove our reference from owner
-        if( m_owner != NULL )
-        {
-                m_owner->RemoveGuardianRef( this );
-                m_owner = NULL;
-        }
+        PrepareForDeletion();
 
         if(!IsInWorld())
                 return;
-
-        if(GetMapMgr() && GetMapMgr()->GetMapInfo() && GetMapMgr()->GetMapInfo()->type == INSTANCE_RAID)
-        {
-                if(GetCreatureInfo() && GetCreatureInfo()->Rank == 3)
-                {
-                        GetMapMgr()->RemoveCombatInProgress(GetGUID());
-                }
-        }
 
         if( IsPet() )
@@ -2116 +2095 @@
                 (*itr)->RemoveSanctuaryFlag();
 }
+
+void Creature::PrepareForDeletion()
+{
+        //remove ai stuff
+        sEventMgr.RemoveEvents( this, EVENT_CREATURE_AISPELL );
+
+        if( GetScript() != NULL )
+        {
+                GetScript()->Destroy();
+                _myScriptClass = NULL;
+        }
+
+        RemoveAllAuras();
+        
+        // If we have a summons then let's remove them
+        RemoveAllGuardians();
+        
+        // remove our reference from owner
+        if( m_owner != NULL )
+        {
+                m_owner->RemoveGuardianRef( this );
+                m_owner = NULL;
+        }
+
+        if(!IsInWorld())
+                return;
+
+        if(GetMapMgr() && GetMapMgr()->GetMapInfo() && GetMapMgr()->GetMapInfo()->type == INSTANCE_RAID)
+        {
+                if(GetCreatureInfo() && GetCreatureInfo()->Rank == 3)
+                {
+                        GetMapMgr()->RemoveCombatInProgress(GetGUID());
+                }
+        }
+}

trunk/src/arcemu-world/Creature.h

@@ -300 +300 @@
         void AddToWorld(MapMgr * pMapMgr);
         void RemoveFromWorld(bool addrespawnevent, bool free_guid);
+        void RemoveFromWorld(bool free_guid);
+
+        void PrepareForDeletion();//remove auras, guardians, scripts
 
         /// Creation