diff options
| author | Matan Shukry <matanshukry@gmail.com> | 2021-01-22 22:24:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 21:24:07 +0100 |
| commit | e08910deaf224557102b4ec93972347bb7a3ea16 (patch) | |
| tree | a99c1a8e7fa54c2c7e75da39beee8c866cb87bdb | |
| parent | 1a12c0b1aebf1e2cb21f6c344bb43bb6f6094cdc (diff) | |
Core/Spells: IsAllowingDeadTargets now checks effects targets as well (#25914)
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
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 |