diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-07-09 18:44:21 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-22 00:33:53 +0100 |
| commit | 0ac5b1da8cf79bda25789abb14ec8fb21cd93089 (patch) | |
| tree | e882fe72be8b4dbf12d47f8f0877dfce58d5f3f8 /src | |
| parent | 508ea9e3c7e21f363ff6ec4386cec951a6404078 (diff) | |
Core/Spells: Don't select corpses for spell targets that expect to hit units
Closes #24980
(cherry picked from commit 14db2215d37c8081aff32a22b0e40b1cb8d6ec96)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp | 6 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index e6e5e552767..43c9b441e7a 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1954,12 +1954,8 @@ uint32 Spell::GetSearcherTypeMask(SpellTargetObjectTypes objType, ConditionConta { case TARGET_OBJECT_TYPE_UNIT: case TARGET_OBJECT_TYPE_UNIT_AND_DEST: - if (!m_spellInfo->HasAttribute(SPELL_ATTR2_CAN_TARGET_DEAD)) - { - retMask &= GRID_MAP_TYPE_MASK_PLAYER | GRID_MAP_TYPE_MASK_CREATURE; - break; - } - [[fallthrough]]; + retMask &= GRID_MAP_TYPE_MASK_PLAYER | GRID_MAP_TYPE_MASK_CREATURE; + break; case TARGET_OBJECT_TYPE_CORPSE: case TARGET_OBJECT_TYPE_CORPSE_ENEMY: case TARGET_OBJECT_TYPE_CORPSE_ALLY: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index e3d53c02e36..a848a4e2ca1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -3188,11 +3188,6 @@ class spell_the_lich_king_jump_remove_aura : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_jump_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) - { - targets.remove_if([](WorldObject const* target) { return target->IsCorpse(); }); - } - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -3201,7 +3196,6 @@ class spell_the_lich_king_jump_remove_aura : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_jump_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; |