diff options
| -rw-r--r-- | src/game/Player.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 1c99089e9c3..af6578290cd 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -19232,7 +19232,7 @@ void Player::SendComboPoints() void Player::AddComboPoints(Unit* target, int8 count, Spell * spell) { - if(!count) + if (!count) return; int8 * comboPoints = spell ? &spell->m_comboPointGain : &m_comboPoints; @@ -19240,24 +19240,28 @@ void Player::AddComboPoints(Unit* target, int8 count, Spell * spell) // without combo points lost (duration checked in aura) RemoveAurasByType(SPELL_AURA_RETAIN_COMBO_POINTS); - if(target->GetGUID() == m_comboTarget) - { + if (target->GetGUID() == m_comboTarget) *comboPoints += count; - } else { - if(m_comboTarget) - if(Unit* target2 = ObjectAccessor::GetUnit(*this,m_comboTarget)) + if (m_comboTarget) + if (Unit* target2 = ObjectAccessor::GetUnit(*this, m_comboTarget)) target2->RemoveComboPointHolder(GetGUIDLow()); + // Spells will always add value to m_comboPoints eventualy, so it must be cleared first + if (spell) + m_comboPoints = 0; + m_comboTarget = target->GetGUID(); *comboPoints = count; target->AddComboPointHolder(GetGUIDLow()); } - if (*comboPoints > 5) *comboPoints = 5; - else if (*comboPoints < 0) *comboPoints = 0; + if (*comboPoints > 5) + *comboPoints = 5; + else if (*comboPoints < 0) + *comboPoints = 0; if (!spell) SendComboPoints(); |