aboutsummaryrefslogtreecommitdiff
path: root/src/game/Spell.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r--src/game/Spell.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 5cdbef26eed..0999862f74f 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2745,15 +2745,17 @@ void Spell::finish(bool ok)
}
}
- /*if (IsMeleeAttackResetSpell())
+ if (IsMeleeAttackResetSpell())
{
m_caster->resetAttackTimer(BASE_ATTACK);
if(m_caster->haveOffhandWeapon())
m_caster->resetAttackTimer(OFF_ATTACK);
- }*/
+ if(!(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_NOT_RESET_AUTOSHOT))
+ m_caster->resetAttackTimer(RANGED_ATTACK);
+ }
- /*if (IsRangedAttackResetSpell())
- m_caster->resetAttackTimer(RANGED_ATTACK);*/
+ //if (IsRangedAttackResetSpell())
+ // m_caster->resetAttackTimer(RANGED_ATTACK);
// Clear combo at finish state
if(m_caster->GetTypeId() == TYPEID_PLAYER && NeedsComboPoints(m_spellInfo))