aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiscover- <amort11@hotmail.com>2014-01-19 04:19:58 -0800
committerDiscover- <amort11@hotmail.com>2014-01-19 04:19:58 -0800
commit55bde59a92e0d8c5d1cc96f7d3ec63855d3f0582 (patch)
treee464fb49bd05ba2a67091bb4c733bb49622a6aca /src
parent18ab91bd1d04b9ed019d61c75f02bb36af6198e5 (diff)
parent47c8c1eb6b8e26573cec632bce3f50785101fa4a (diff)
Merge pull request #10386 from Discover-/Health-Funnel
Core/Spells: Health Funnel now always damages the warlock, even if it do...
Diffstat (limited to 'src')
-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 5cb86244aa1..1273b92596f 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -6106,8 +6106,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);