Resolve merge issues and cleanup whitespace
This commit is contained in:
1 parent
68e0ef8039
commit
6a1f4f1da0
11 files changed
+30
-28
No files matched your search
@@ -2714,7 +2714,7 @@ void Unit::_UpdateAutoRepeatSpell()
|
||||
{
|
||||
// check "realtime" interrupts
|
||||
// don't cancel spells which are affected by a SPELL_AURA_CAST_WHILE_WALKING effect
|
||||
if (((GetTypeId() == TYPEID_PLAYER && ToPlayer()->isMoving()) || IsNonMeleeSpellCasted(false, false, true, m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id == 75)) &&
|
||||
if (((GetTypeId() == TYPEID_PLAYER && ToPlayer()->isMoving()) || IsNonMeleeSpellCasted(false, false, true, m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id == 75)) &&
|
||||
!HasAuraTypeWithAffectMask(SPELL_AURA_CAST_WHILE_WALKING, m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo))
|
||||
{
|
||||
// cancel wand shoot
|
||||
|
||||
Reference in new issue
Block a user