aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/Spell.cpp
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-10-05 22:46:26 -0300
committerariel- <ariel-@users.noreply.github.com>2016-10-05 22:46:26 -0300
commitf09e7cbbfe1808956c50efefa6446515b62927e3 (patch)
treebc25439aa0806df38a3d76f868b8d5384ab28510 /src/server/game/Spells/Spell.cpp
parent97e70b599ed21c8e6f4df8d819e30780197c2e60 (diff)
Core/Unit: prevent m_extraAttacks underflow. Fixes a freeze with SPELL_EFFECT_ADD_EXTRA_ATTACKS
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
-rw-r--r--src/server/game/Spells/Spell.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index f072d71d9ff..9b21ea4c5fb 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -3498,12 +3498,12 @@ void Spell::_handle_finish_phase()
m_caster->m_playerMovingMe->GainSpellComboPoints(m_comboPointGain);
}
- if (m_caster->m_extraAttacks && m_spellInfo->HasEffect(SPELL_EFFECT_ADD_EXTRA_ATTACKS))
+ if (m_caster->HasExtraAttacksPending() && m_spellInfo->HasEffect(SPELL_EFFECT_ADD_EXTRA_ATTACKS))
{
if (Unit* victim = ObjectAccessor::GetUnit(*m_caster, m_targets.GetOrigUnitTargetGUID()))
m_caster->HandleProcExtraAttackFor(victim);
else
- m_caster->m_extraAttacks = 0;
+ m_caster->SetExtraAttacks(0);
}
// Handle procs on finish