diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-07-20 15:23:14 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-11 16:59:44 +0100 |
| commit | e30cbb960e1bd8c7ccbc1963a84739d3c101bad5 (patch) | |
| tree | 65df3bd2891d50ad9de4477434ba7e0b3905115f | |
| parent | 3532173ee340573be937b4c5799c155fa2cc906c (diff) | |
Core/Spell: Quick readability change. Functionality not altered.
(cherry picked from commit 03bef355001d35c65d17134ea1b878d2a762cd09)
# Conflicts:
# src/server/game/Spells/Spell.cpp
| -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 22aa46e73a1..6649dd3f2b6 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3049,7 +3049,7 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect const* triggered // exception are only channeled spells that have no casttime and SPELL_ATTR5_CAN_CHANNEL_WHEN_MOVING // (even if they are interrupted on moving, spells with almost immediate effect get to have their effect processed before movement interrupter kicks in) // don't cancel spells which are affected by a SPELL_AURA_CAST_WHILE_WALKING effect - if (((m_spellInfo->IsChanneled() || m_casttime) && m_caster->GetTypeId() == TYPEID_PLAYER && (!m_caster->IsCharmed() || !m_caster->GetCharmerGUID().IsCreature()) && m_caster->isMoving() && + if (((m_spellInfo->IsChanneled() || m_casttime) && m_caster->GetTypeId() == TYPEID_PLAYER && !(m_caster->IsCharmed() && m_caster->GetCharmerGUID().IsCreature()) && m_caster->isMoving() && m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_MOVEMENT) && !m_caster->HasAuraTypeWithAffectMask(SPELL_AURA_CAST_WHILE_WALKING, m_spellInfo)) { // 1. Is a channel spell, 2. Has no casttime, 3. And has flag to allow movement during channel |