[Core/Spell] To fix hunter spell Stampede #302 #315 (#320)

Remaining issues will be handled by PR later
Legends-of-Azeroth · Aug 11, 2024 · 3cd41b3 · 3cd41b3
1 parent 9f94a7a
commit 3cd41b3
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp
@@ -323,7 +323,7 @@ void TempSummon::UnSummon(uint32 msTime)
     }
 
     //ASSERT(!IsPet());
-    if (IsPet())
+    if (IsPet() && !ToPet()->IsTemporary())
     {
         ToPet()->Remove(PET_REMOVE_DISMISS, PET_REMOVE_FLAG_RESET_CURRENT);
         ASSERT(!IsInWorld());
@@ -334,6 +334,9 @@ void TempSummon::UnSummon(uint32 msTime)
     if (owner && owner->GetTypeId() == TYPEID_UNIT && owner->ToCreature()->IsAIEnabled)
         owner->ToCreature()->AI()->SummonedCreatureDespawn(this);
 
+    if (IsAIEnabled)
+        AI()->Unsummoned();
+
     AddObjectToRemoveList();
 }
 
@@ -429,14 +432,18 @@ void Minion::RemoveFromWorld()
 
 bool Minion::IsGuardianPet() const
 {
-    return IsPet() || (m_Properties && m_Properties->Category == SUMMON_CATEGORY_PET);
+    if (IsPet())
+        return !ToPet()->IsTemporary();
+
+    return m_Properties && m_Properties->Category == SUMMON_CATEGORY_PET;
 }
 
 Guardian::Guardian(SummonPropertiesEntry const* properties, Unit* owner, bool isWorldObject) : Minion(properties, owner, isWorldObject), m_bonusSpellDamage(0)
 {
     memset(m_statFromOwner, 0, sizeof(float)*MAX_STATS);
     m_unitTypeMask |= UNIT_MASK_GUARDIAN;
-    if (properties && properties->Type == SUMMON_TYPE_PET)
+    if (properties && (properties->Category == SUMMON_CATEGORY_PET ||
+        (properties->Type == SUMMON_TYPE_PET && properties->Category != SUMMON_CATEGORY_ALLY)))
     {
         m_unitTypeMask |= UNIT_MASK_CONTROLABLE_GUARDIAN;
         InitCharmInfo();

diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
@@ -570,15 +570,7 @@ void Pet::Update(uint32 diff)
                     m_duration -= diff;
                 else
                 {
-                    if (getPetType() != SUMMON_PET)
-                    {
-                        Remove(PET_REMOVE_DISMISS);
-                    }
-                    else
-                    {
-                       Remove(PET_REMOVE_DISMISS, PET_REMOVE_FLAG_RESET_CURRENT); 
-                    }
-
+                    Remove(PET_REMOVE_DISMISS);
                     return;
                 }
             }
@@ -591,7 +583,10 @@ void Pet::Update(uint32 diff)
 
 void Pet::Remove(PetRemoveMode mode, int32 flags)
 {
-    GetOwner()->RemovePet(mode, flags);
+    if (IsTemporary())
+        UnSummon();
+    else
+        GetOwner()->RemovePet(mode, flags);
 }
 
 bool Pet::IsAutoCastEnabled(uint32 spellId) const

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
@@ -1,4 +1,4 @@
-/*
+/*
 * 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
@@ -13820,6 +13820,16 @@ 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();

diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
@@ -338,6 +338,7 @@ class spell_hunt_stampede : public SpellScript
         pet->SetDuration(20 * IN_MILLISECONDS);
         if (GetExplTargetUnit()->GetCharmerOrOwnerPlayerOrPlayerItself() || pet->GetMap()->IsBattlegroundOrArena())
             pet->CastSpell(pet, SPELL_HUNTER_STAMPEDE_DAMAGE_REDUCTION, true);
+        pet->SetFullHealth();
     }
 
     void Register() override