Skip to content

Commit

Permalink
Fix combo point related self-triggers
Browse files Browse the repository at this point in the history
  • Loading branch information
killerwife authored and Warlockbugs committed Oct 8, 2016
1 parent f89f9c1 commit a822033
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/game/Unit.cpp
Expand Up @@ -9218,7 +9218,7 @@ int32 Unit::CalculateSpellDamage(Unit const* target, SpellEntry const* spellProt
int32 value = basePoints;

// random damage
if (comboDamage != 0 && unitPlayer && target && (target->GetObjectGuid() == unitPlayer->GetComboTargetGuid()))
if (comboDamage != 0.0f && unitPlayer && target && (target->GetObjectGuid() == unitPlayer->GetComboTargetGuid() || IsOnlySelfTargeting(spellProto)))
value += (int32)(comboDamage * comboPoints);

if (Player* modOwner = GetSpellModOwner())
Expand Down

0 comments on commit a822033

Please sign in to comment.