aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiscover- <amort11@hotmail.com>2013-07-27 22:23:48 +0200
committerDiscover- <amort11@hotmail.com>2013-07-27 22:23:48 +0200
commit47c8c1eb6b8e26573cec632bce3f50785101fa4a (patch)
treeac352d76a067bdfa7c6687dcd9beb51fb27d2774
parenta522be81081dff341528969c799b526340294bc2 (diff)
Core/Spells: Health Funnel now always damages the warlock, even if it does not heal the pet because it's already at full health. Previously it would display the 'Miss' effect on the owner of the pet.
Fixes #9991
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 20b6e67c5db..0ee6386617a 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -6109,8 +6109,10 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const
if (target != caster && GetSpellInfo()->AttributesEx2 & SPELL_ATTR2_HEALTH_FUNNEL)
{
uint32 funnelDamage = GetSpellInfo()->ManaPerSecond; // damage is not affected by spell power
- if ((int32)funnelDamage > gain)
+
+ if ((int32)funnelDamage > gain && gain > 0)
funnelDamage = gain;
+
uint32 funnelAbsorb = 0;
caster->DealDamageMods(caster, funnelDamage, &funnelAbsorb);
caster->SendSpellNonMeleeDamageLog(caster, GetId(), funnelDamage, GetSpellInfo()->GetSchoolMask(), funnelAbsorb, 0, false, 0, false);