diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2017-06-25 03:41:16 +0200 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-06-24 22:41:16 -0300 |
| commit | 489478b74d96c2ea940a2316fd11f8e81991cf07 (patch) | |
| tree | 5faa936414542c9c7442d6386fc22b2d1d508ffc /src/server/game/Spells/SpellInfo.cpp | |
| parent | 641c2036abed70adff5c384e1679c5c3c986bd72 (diff) | |
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
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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); |