diff options
author | ariel- <ariel-@users.noreply.github.com> | 2016-11-13 23:20:45 -0300 |
---|---|---|
committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-12-30 20:47:04 +0100 |
commit | 6d7abb8181c42c2ce11892ea602bb6e9330dcdff (patch) | |
tree | 64b9c024298e177226174127acef5b593aaae8f6 /src | |
parent | f00f3c414ee72ccc56d9c81d7832ee5ec16857ce (diff) |
Core/Spell: do not fail triggered Charge effects in case a root is present.
Fixes Master's call when pet is rooted
(cherry picked from commit 5daabe303e9132c3b398eca44b9d0f4e9fb694ec)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Spells/Spell.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index f9a6e45e7e7..f683d0fe1cd 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5363,7 +5363,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint } case SPELL_EFFECT_CHARGE: { - if (m_caster->HasUnitState(UNIT_STATE_ROOT)) + if (!(_triggeredCastFlags & TRIGGERED_IGNORE_CASTER_AURAS) && m_caster->HasUnitState(UNIT_STATE_ROOT)) return SPELL_FAILED_ROOTED; if (GetSpellInfo()->NeedsExplicitUnitTarget()) |