From 489478b74d96c2ea940a2316fd11f8e81991cf07 Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 25 Jun 2017 03:41:16 +0200 Subject: Core/Entities: Extend combo point system to all Units and fix numerous quirks with rogue CP and vehicles (Malygos P3) (#19914) - Implement Wolverine Bite (fixes #752) - General combo point system cleanup --- src/server/game/Spells/SpellInfo.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/game/Spells/SpellInfo.cpp') diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 2a0b972e631..9e393f2fcad 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -449,10 +449,8 @@ int32 SpellEffectInfo::CalcValue(Unit const* caster, int32 const* bp, Unit const if (caster) { // bonus amount from combo points - if (caster->m_playerMovingMe) - if (uint8 comboPoints = caster->m_playerMovingMe->GetComboPoints()) - if (float comboDamage = PointsPerComboPoint) - value += comboDamage* comboPoints; + if (uint8 comboPoints = caster->GetComboPoints()) + value += PointsPerComboPoint * comboPoints; value = caster->ApplyEffectModifiers(_spellInfo, _effIndex, value); -- cgit v1.2.3