Changeset 3148

Timestamp:

02/03/2010 04:40:07 AM (5 weeks ago)

Author:

jackpoz

Message:

FIXED: CreatureAIScript::Destroy() is called by Creature::Despawn(), too.

Files:

• trunk/src/arcemu-world/Creature.cpp (modified) (3 diffs)

trunk/src/arcemu-world/Creature.cpp

@@ -742 +742 @@
 void Creature::RemoveFromWorld( bool addrespawnevent, bool free_guid )
 {
-
-    //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() )
-        {
-                if( IsPet() )
-                {
-                        static_cast<Pet*>(this)->ScheduledForDeletion = true;
-                        Unit::RemoveFromWorld( true );
-            SafeDelete();
-                        return;
-                }
-                
-                uint32 delay = 0;
-                if( addrespawnevent && ( m_respawnTimeOverride > 0 || ( proto && proto->RespawnTime > 0 ) ) )
-                        delay = m_respawnTimeOverride > 0 ? m_respawnTimeOverride : proto->RespawnTime;
-
-                Despawn( 0, delay );
-        }
+        uint32 delay = 0;
+        if( addrespawnevent && ( m_respawnTimeOverride > 0 || ( proto && proto->RespawnTime > 0 ) ) )
+                delay = m_respawnTimeOverride > 0 ? m_respawnTimeOverride : proto->RespawnTime;
+
+        Despawn( 0, delay );
 }
 
@@ -1867 +1834 @@
         }
 
+        //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;
@@ -1878 +1866 @@
         }
 
+        if( IsPet() )
+        {
+                static_cast<Pet*>(this)->ScheduledForDeletion = true;
+                Unit::RemoveFromWorld( true );
+        SafeDelete();
+                return;
+        }
+        
         if(respawntime && !m_noRespawn)
         {