Scripts/Spells: Prevent sacrificing immune minions with Death Pact (#29920)

Co-authored-by: Shauren <shauren.trinity@gmail.com>

1 files changed, 26 insertions, 26 deletions

diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index 2e16e4f7ebd..71eb6b58fe1 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -758,42 +758,42 @@ class spell_dk_death_pact : public SpellScript
 {
     PrepareSpellScript(spell_dk_death_pact);
 
-    SpellCastResult CheckCast()
+    void FilterTargets(std::list<WorldObject*>& targetList)
     {
-        // Check if we have valid targets, otherwise skip spell casting here
-        if (Player* player = GetCaster()->ToPlayer())
-            for (Unit::ControlList::const_iterator itr = player->m_Controlled.begin(); itr != player->m_Controlled.end(); ++itr)
-                if (Creature* undeadPet = (*itr)->ToCreature())
-                    if (undeadPet->IsAlive() &&
-                        undeadPet->GetOwnerGUID() == player->GetGUID() &&
-                        undeadPet->GetCreatureType() == CREATURE_TYPE_UNDEAD &&
-                        undeadPet->IsWithinDist(player, 100.0f, false))
-                        return SPELL_CAST_OK;
+        targetList.remove_if([&](WorldObject* target)
+        {
+            Unit* unit = target->ToUnit();
+            if (!unit)
+                return true;
+            if (unit->GetOwnerGUID() != GetCaster()->GetGUID())
+                return true;
+            if (unit->GetCreatureType() != CREATURE_TYPE_UNDEAD)
+                return true;
+            return false;
+        });
 
-        return SPELL_FAILED_NO_PET;
-    }
+        if (targetList.empty())
+        {
+            FinishCast(SPELL_FAILED_NO_PET);
+            return;
+        }
 
-    void FilterTargets(std::list<WorldObject*>& targetList)
-    {
-        Unit* target = nullptr;
-        for (std::list<WorldObject*>::iterator itr = targetList.begin(); itr != targetList.end(); ++itr)
+        targetList.remove_if([&](WorldObject* target)
         {
-            if (Unit* unit = (*itr)->ToUnit())
-                if (unit->GetOwnerGUID() == GetCaster()->GetGUID() && unit->GetCreatureType() == CREATURE_TYPE_UNDEAD)
-                {
-                    target = unit;
-                    break;
-                }
+            return target->ToUnit()->IsImmunedToSpell(GetSpellInfo(), GetCaster());
+        });
+
+        if (targetList.empty())
+        {
+            FinishCast(SPELL_FAILED_IMMUNE);
+            return;
         }
 
-        targetList.clear();
-        if (target)
-            targetList.push_back(target);
+        Trinity::Containers::RandomResize(targetList, 1);
     }
 
     void Register() override
     {
-        OnCheckCast += SpellCheckCastFn(spell_dk_death_pact::CheckCast);
         OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_death_pact::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY);
     }
 };