[9858] Restore work of 1064 and ranks, broken in [9854]

This commit is contained in:
Laise 2010-05-10 19:29:41 +03:00
parent aa59339e1a
commit 884e4f8ecc
2 changed files with 11 additions and 9 deletions

View file

@ -3146,16 +3146,18 @@ void Spell::EffectHeal(SpellEffectIndex /*eff_idx*/)
// Chain Healing // Chain Healing
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000100)) if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000000100))
{
if (unitTarget == m_targets.getUnitTarget())
{ {
// check for Riptide // check for Riptide
if (unitTarget != m_targets.getUnitTarget())
return;
Aura* riptide = unitTarget->GetAura(SPELL_AURA_PERIODIC_HEAL, SPELLFAMILY_SHAMAN, 0, 0x00000010, caster->GetGUID()); Aura* riptide = unitTarget->GetAura(SPELL_AURA_PERIODIC_HEAL, SPELLFAMILY_SHAMAN, 0, 0x00000010, caster->GetGUID());
if (!riptide) if (riptide)
return; {
addhealth += addhealth/4; addhealth += addhealth/4;
unitTarget->RemoveAura(riptide); unitTarget->RemoveAura(riptide);
} }
}
}
addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, addhealth, HEAL); addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, addhealth, HEAL);
addhealth = unitTarget->SpellHealingBonusTaken(caster, m_spellInfo, addhealth, HEAL); addhealth = unitTarget->SpellHealingBonusTaken(caster, m_spellInfo, addhealth, HEAL);

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9857" #define REVISION_NR "9858"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__