From a822033d92d85fbba27cf7bf198d5ead5ccd0724 Mon Sep 17 00:00:00 2001 From: killerwife Date: Sat, 8 Oct 2016 22:22:53 +0200 Subject: [PATCH] Fix combo point related self-triggers --- src/game/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index aaf126d1c10..c2cdff6c18c 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -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())