From e08910deaf224557102b4ec93972347bb7a3ea16 Mon Sep 17 00:00:00 2001 From: Matan Shukry Date: Fri, 22 Jan 2021 22:24:07 +0200 Subject: [PATCH] Core/Spells: IsAllowingDeadTargets now checks effects targets as well (#25914) --- src/server/game/Spells/SpellInfo.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 63a57259486..4f98c6573c7 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1549,7 +1549,19 @@ bool SpellInfo::IsRequiringDeadTarget() const bool SpellInfo::IsAllowingDeadTarget() const { - return HasAttribute(SPELL_ATTR2_CAN_TARGET_DEAD) || Targets & (TARGET_FLAG_CORPSE_ALLY | TARGET_FLAG_CORPSE_ENEMY | TARGET_FLAG_UNIT_DEAD); + if (HasAttribute(SPELL_ATTR2_CAN_TARGET_DEAD) || Targets & (TARGET_FLAG_CORPSE_ALLY | TARGET_FLAG_CORPSE_ENEMY | TARGET_FLAG_UNIT_DEAD)) + return true; + + for (SpellEffectInfo const* effect : _effects) + { + if (!effect) + continue; + + if (effect->TargetA.GetObjectType() == TARGET_OBJECT_TYPE_CORPSE || effect->TargetB.GetObjectType() == TARGET_OBJECT_TYPE_CORPSE) + return true; + } + + return false; } bool SpellInfo::IsGroupBuff() const