[Core/Spell] Fix hunter spell Stampede with HUNTER_SPELL_GLYPH_OF_STA… (

#315) * [Core/Spell] Fix hunter spell Stampede with HUNTER_SPELL_GLYPH_OF_STAMPEDE * Add some checks * revent some code
Legends-of-Azeroth · Aug 4, 2024 · 220e257 · 220e257
1 parent 8b651d0
commit 220e257
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 deletions.
diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp
@@ -1,5 +1,5 @@
 /*
-* This file is part of the Pandaria 5.4.8 Project. See THANKS file for Copyright information
+* This file is part of the Legends of Azeroth Pandaria Project. See THANKS file for Copyright information
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -323,9 +323,9 @@ void TempSummon::UnSummon(uint32 msTime)
     }
 
     //ASSERT(!IsPet());
-    if (IsPet() && !ToPet()->IsTemporary())
+    if (IsPet())
     {
-        ((Pet*)this)->Remove(PET_REMOVE_DISMISS, PET_REMOVE_FLAG_RESET_CURRENT);
+        ToPet()->Remove(PET_REMOVE_DISMISS, PET_REMOVE_FLAG_RESET_CURRENT);
         ASSERT(!IsInWorld());
         return;
     }

diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
@@ -95,6 +95,12 @@ void Pet::RemoveFromWorld()
     ///- Remove the pet from the accessor
     if (IsInWorld())
     {
+        if (IsTemporary()) // hackfix, need remove in future
+        {
+            ASSERT(FindMap() == GetOwner()->FindMap());
+            GetOwner()->SetMinion(this, false);
+            GetOwner()->RemoveSummon(this);
+        }
         ///- Don't call the function for Creature, normal mobs + totems go in a different storage
         Unit::RemoveFromWorld();
         GetMap()->GetObjectsStore().Remove<Pet>(GetGUID());
@@ -564,7 +570,15 @@ void Pet::Update(uint32 diff)
                     m_duration -= diff;
                 else
                 {
-                    Remove(PET_REMOVE_DISMISS);
+                    if (getPetType() != SUMMON_PET)
+                    {
+                        Remove(PET_REMOVE_DISMISS);
+                    }
+                    else
+                    {
+                       Remove(PET_REMOVE_DISMISS, PET_REMOVE_FLAG_RESET_CURRENT); 
+                    }
+
                     return;
                 }
             }
@@ -577,10 +591,7 @@ void Pet::Update(uint32 diff)
 
 void Pet::Remove(PetRemoveMode mode, int32 flags)
 {
-    if (IsTemporary())
-        UnSummon();
-    else
-        GetOwner()->RemovePet(mode, flags);
+    GetOwner()->RemovePet(mode, flags);
 }
 
 bool Pet::IsAutoCastEnabled(uint32 spellId) const

diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h
@@ -1,5 +1,5 @@
 /*
-* This file is part of the Pandaria 5.4.8 Project. See THANKS file for Copyright information
+* This file is part of the Legends of Azeroth Pandaria Project. See THANKS file for Copyright information
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the

diff --git a/src/server/game/Entities/Pet/PetDefines.h b/src/server/game/Entities/Pet/PetDefines.h
@@ -1,5 +1,5 @@
 /*
-* This file is part of the Pandaria 5.4.8 Project. See THANKS file for Copyright information
+* This file is part of the Legends of Azeroth Pandaria Project. See THANKS file for Copyright information
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
@@ -13785,6 +13785,9 @@ void Unit::RemoveFromWorld()
         GetMotionMaster()->Clear(false);                    // Do it here, because MovementInform may provoke casts.
 
         m_duringRemoveFromWorld = true;
+        if (UnitAI* ai = GetAI())
+            ai->OnDespawn();
+
         if (IsVehicle())
             RemoveVehicleKit(true);
 
@@ -13817,16 +13820,6 @@ void Unit::RemoveFromWorld()
             }
         }
 
-        if (GetTypeId() == TYPEID_PLAYER)
-        {
-            while (!m_summons.empty())
-            {
-                auto summon = m_summons.front();
-                m_summons.pop_front();
-                summon->UnSummon();
-            }
-        }
-
         getHostileRefManager().clearReferences();
 
         WorldObject::RemoveFromWorld();