aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/Spell.cpp6
-rw-r--r--src/game/SpellEffects.cpp3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 9d5f425920f..108453d0b27 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -4658,6 +4658,12 @@ SpellCastResult Spell::CheckCast(bool strict)
if(m_targets.getUnitTarget() && !m_caster->IsFriendlyTo(m_targets.getUnitTarget()) && !m_caster->HasInArc( M_PI, m_targets.getUnitTarget() ))
return SPELL_FAILED_UNIT_NOT_INFRONT;
}
+ else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellInfo->SpellFamilyFlags[0] == 0x2000) // Death Coil (DeathKnight)
+ {
+ Unit* target = m_targets.getUnitTarget();
+ if (!target || (target->IsFriendlyTo(m_caster) && target->GetCreatureType() != CREATURE_TYPE_UNDEAD))
+ return SPELL_FAILED_BAD_TARGETS;
+ }
else if (m_spellInfo->Id == 19938) // Awaken Peon
{
Unit *unit = m_targets.getUnitTarget();
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 8ab8b37dec7..0e7668dc94b 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -1905,9 +1905,6 @@ void Spell::EffectDummy(uint32 i)
{
if(m_caster->IsFriendlyTo(unitTarget))
{
- if(unitTarget->GetCreatureType() != CREATURE_TYPE_UNDEAD)
- return;
-
int32 bp = damage * 1.5f;
m_caster->CastCustomSpell(unitTarget, 47633, &bp, NULL, NULL, true);
}