diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-05-13 19:40:05 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-05-13 19:40:05 -0500 |
| commit | e74135946d2cb2b6a522cfa979cfef0263a9fd8e (patch) | |
| tree | 0a6e3808cc8cdc2128e2800b152b461972278a4c /src/server/game/Spells/SpellEffects.cpp | |
| parent | 1a06e197fd7d908ff62b801176cc3797306b07cd (diff) | |
| parent | 72d00c476ca6b6e2d48f5fdfaae48bf383e44ef0 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 352b91c635c..c306da9d43b 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1581,12 +1581,12 @@ void Spell::EffectHeal(SpellEffIndex /*effIndex*/) //addhealth += tickheal * tickcount; //addhealth = caster->SpellHealingBonus(m_spellInfo, addhealth, HEAL, unitTarget); } - // Glyph of Nourish + // Nourish else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x2000000) { addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, addhealth, HEAL); - addhealth = unitTarget->SpellHealingBonusTaken(caster, m_spellInfo, addhealth, HEAL); + // Glyph of Nourish if (AuraEffect const* aurEff = m_caster->GetAuraEffect(62971, 0)) { Unit::AuraEffectList const& Periodic = unitTarget->GetAuraEffectsByType(SPELL_AURA_PERIODIC_HEAL); |