From bdbdc8030ac75f530595377a8c8fc044e36d975e Mon Sep 17 00:00:00 2001 From: talamortis Date: Sat, 21 Jul 2018 22:22:59 +0100 Subject: [PATCH] Update Death Grip * Added another check to Death grip to ignore some boss ids, as need for some faction champions in argent crusade. closes #982 --- src/server/scripts/Spells/spell_dk.cpp | 45 +++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index d4bbd4de7..5fcd509d5 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -1559,6 +1559,49 @@ class spell_dk_death_grip : public SpellScriptLoader return SPELL_CAST_OK; } + uint32 EntryCheck(uint32 entry) + { + Creature* targetCreature = GetHitCreature(); + + switch (entry = targetCreature->GetEntry()) + { + //Alliance Faction Champions + case 34461: + case 34460: + case 34469: + case 34467: + case 34468: + case 34465: + case 34471: + case 34466: + case 34473: + case 34472: + case 34470: + case 34463: + case 34474: + case 34475: + + //Horde Faction Champions + case 34458: + case 34451: + case 34459: + case 34448: + case 34449: + case 34445: + case 34456: + case 34447: + case 34441: + case 34454: + case 34444: + case 34455: + case 34450: + case 34453: + break; + default: + break; + } + } + void HandleBaseDummy(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -1568,7 +1611,7 @@ class spell_dk_death_grip : public SpellScriptLoader if (caster != target) { - if (targetCreature && (targetCreature->isWorldBoss() || targetCreature->IsDungeonBoss())) + if (targetCreature && (targetCreature->isWorldBoss() || targetCreature->IsDungeonBoss()) && targetCreature->GetEntry() != EntryCheck(targetCreature->GetEntry())) { return; }