Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-10 03:59:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Correct meaning & usage of SPELL_ATTR_EX2_NOT_RESET_AUTOSHOOT (now SPELL_ATTR_EX2_NOT_RESET_AUTO_ACTIONS) to ignore timer reset for both melee swings and ranged autoshoots, fixes issue 2639

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shocker
2010-09-12 23:52:37 +03:00
parent c4028111bd
commit cbe95da41a
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Spells/Spell.cpp
View File

@@ -3738,7 +3738,7 @@ void Spell::finish(bool ok)
}
}
if (IsMeleeAttackResetSpell())
if (IsAutoActionResetSpell())
{
bool found = false;
Unit::AuraEffectList const& vIgnoreReset = m_caster->GetAuraEffectsByType(SPELL_AURA_IGNORE_MELEE_RESET);
@@ -3750,13 +3750,12 @@ void Spell::finish(bool ok)
break;
}
}
if (!found)
if (!found && !(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_NOT_RESET_AUTO_ACTIONS))
{
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);
m_caster->resetAttackTimer(RANGED_ATTACK);
}
}