diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-02-01 13:10:51 -0300 |
|---|---|---|
| committer | Ariel Silva <ariel-@users.noreply.github.com> | 2018-03-09 14:41:28 -0300 |
| commit | 080d2c6cd439acb2059adc4e24a279de98aa0db6 (patch) | |
| tree | 53cd60562b73a7157fe0d0e6f4263df2831a656f /src/server/game/Spells/SpellInfo.cpp | |
| parent | e8d5aa56cc48572d81e1898b7b4ff10cfa6d1957 (diff) | |
Core/Spells: rework part 4: iterate over effects first
Ref #18395
Implement far spell queue processing
Closes #7395
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index d581e1cc52e..cf8ef564413 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -390,19 +390,6 @@ bool SpellEffectInfo::IsAreaAuraEffect() const return false; } -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); -} - -bool SpellEffectInfo::IsFarDestTargetEffect() const -{ - return Effect == SPELL_EFFECT_TELEPORT_UNITS; -} - bool SpellEffectInfo::IsUnitOwnedAuraEffect() const { return IsAreaAuraEffect() || Effect == SPELL_EFFECT_APPLY_AURA; @@ -3071,14 +3058,14 @@ float SpellInfo::GetMaxRange(bool positive, Unit* caster, Spell* spell) const int32 SpellInfo::GetDuration() const { if (!DurationEntry) - return 0; + return IsPassive() ? -1 : 0; return (DurationEntry->Duration[0] == -1) ? -1 : abs(DurationEntry->Duration[0]); } int32 SpellInfo::GetMaxDuration() const { if (!DurationEntry) - return 0; + return IsPassive() ? -1 : 0; return (DurationEntry->Duration[2] == -1) ? -1 : abs(DurationEntry->Duration[2]); } |