Changeset 3199

Timestamp:

03/06/2010 07:26:11 AM (6 months ago)

Author:

jackpoz

Message:

FIXED: Failed assertion triggered when a Pet/Summon went out of range from summoner Player. Report any issue at the Trac.

Location:

trunk/src/arcemu-world

Files:

• Object.cpp (modified) (1 diff)
• Pet.cpp (modified) (2 diffs)
• Pet.h (modified) (1 diff)
• Player.cpp (modified) (2 diffs)

trunk/src/arcemu-world/Object.cpp

@@ -2608 +2608 @@
                                         }
 
-                                        pPet->DelayedRemove( false, true );
+                                        pPet->DelayedRemove( false );
                                 }
                                 /* ----------------------------- PET DEATH HANDLING END -------------- */

trunk/src/arcemu-world/Pet.cpp

@@ -844 +844 @@
 }
 
-void Pet::DelayedRemove( bool bTime, bool bDeath )
+void Pet::DelayedRemove( bool bTime, uint32 delay )
 {
         // called when pet has died
@@ -855 +855 @@
         }
         else
-                sEventMgr.AddEvent(this, &Pet::DelayedRemove, true, bDeath, EVENT_PET_DELAYED_REMOVE, PET_DELAYED_REMOVAL_TIME, 1, EVENT_FLAG_DO_NOT_EXECUTE_IN_WORLD_CONTEXT);
+                sEventMgr.AddEvent(this, &Pet::DelayedRemove, true, uint32(0), EVENT_PET_DELAYED_REMOVE, delay, 1, EVENT_FLAG_DO_NOT_EXECUTE_IN_WORLD_CONTEXT);
 }
 

trunk/src/arcemu-world/Pet.h

@@ -168 +168 @@
         void setDeathState(DeathState s);
 
-        void DelayedRemove(bool bTime, bool bDeath);
+        void DelayedRemove(bool bTime, uint32 delay = PET_DELAYED_REMOVAL_TIME);
 
         ARCEMU_INLINE Player* GetPetOwner() { return m_Owner; }

trunk/src/arcemu-world/Player.cpp

@@ -6039 +6039 @@
                 if( pObj == summon )
                 {
-                        if( summon->IsSummon() )
-                                summon->Dismiss();                      // summons
-                        else
-                                summon->Remove( true, false );// hunter pets
+                        summon->DelayedRemove(false,1);//otherwise Pet::Update() will access free'd memory
                         return;
                 }
@@ -6048 +6045 @@
 
     if( pObj->GetGUID() == GetSummonedUnitGUID() )
-                RemoveFieldSummon();
+                sEventMgr.AddEvent(TO_UNIT(this), &Unit::RemoveFieldSummon, EVENT_SUMMON_EXPIRE, 1, 1, EVENT_FLAG_DO_NOT_EXECUTE_IN_WORLD_CONTEXT);//otherwise Creature::Update() will access free'd memory
 }