aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/SpellInfo.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-08-09 17:21:19 +0200
committerShauren <shauren.trinity@gmail.com>2016-08-09 17:21:19 +0200
commit51657e44d1430a93a4256a535af0a67660c95119 (patch)
treeeef7a4f67377ba2f390a3e8544e43ef56ec0c292 /src/server/game/Spells/SpellInfo.cpp
parent8954b83d293e1554c2ba36c9ec3d4cdb8658d167 (diff)
Core/Spells: Renamed some old and new spell effects
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
-rw-r--r--src/server/game/Spells/SpellInfo.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 5db23525a7f..0e428ed5c3d 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -437,7 +437,6 @@ bool SpellEffectInfo::IsFarUnitTargetEffect() const
return (Effect == SPELL_EFFECT_SUMMON_PLAYER)
|| (Effect == SPELL_EFFECT_SUMMON_RAF_FRIEND)
|| (Effect == SPELL_EFFECT_RESURRECT)
- || (Effect == SPELL_EFFECT_RESURRECT_NEW)
|| (Effect == SPELL_EFFECT_SKIN_PLAYER_CORPSE);
}
@@ -1978,7 +1977,7 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, WorldObject const* ta
return SPELL_FAILED_TARGET_AURASTATE;
if (unitTarget->HasAuraType(SPELL_AURA_PREVENT_RESURRECTION))
- if (HasEffect(caster->GetMap()->GetDifficultyID(), SPELL_EFFECT_SELF_RESURRECT) || HasEffect(caster->GetMap()->GetDifficultyID(), SPELL_EFFECT_RESURRECT) || HasEffect(caster->GetMap()->GetDifficultyID(), SPELL_EFFECT_RESURRECT_NEW))
+ if (HasEffect(caster->GetMap()->GetDifficultyID(), SPELL_EFFECT_SELF_RESURRECT) || HasEffect(caster->GetMap()->GetDifficultyID(), SPELL_EFFECT_RESURRECT))
return SPELL_FAILED_TARGET_CANNOT_BE_RESURRECTED;
if (HasAttribute(SPELL_ATTR8_BATTLE_RESURRECTION))