Core/Scripts: Fixed wrong calculation of Aura of Desire

Closes #19322

(cherry picked from commit 333a403409)
This commit is contained in:
Keader
2017-03-20 16:49:42 -03:00
committed by funjoker
parent ca4720662d
commit b234658617

View File

@@ -351,6 +351,8 @@ public:
Talk(SUFF_SAY_RECAP);
me->AttackStop();
me->SetReactState(REACT_PASSIVE);
events.Reset();
me->InterruptNonMeleeSpells(false);
me->GetMotionMaster()->MovePoint(RELIQUARY_DESPAWN_WAYPOINT, DespawnPoint);
}
}
@@ -479,6 +481,8 @@ public:
Talk(DESI_SAY_RECAP);
me->AttackStop();
me->SetReactState(REACT_PASSIVE);
events.Reset();
me->InterruptNonMeleeSpells(false);
me->GetMotionMaster()->MovePoint(RELIQUARY_DESPAWN_WAYPOINT, DespawnPoint);
}
}
@@ -743,7 +747,7 @@ class spell_reliquary_of_souls_aura_of_desire : public SpellScriptLoader
caster->CastCustomSpell(SPELL_AURA_OF_DESIRE_DAMAGE, SPELLVALUE_BASE_POINT0, bp, caster, true, nullptr, aurEff);
}
void UpdateAmount(AuraEffect const* /*effect*/)
void UpdateAmount(AuraEffect* /*aurEff*/)
{
if (AuraEffect* effect = GetAura()->GetEffect(EFFECT_1))
effect->ChangeAmount(effect->GetAmount() - 5);
@@ -752,7 +756,7 @@ class spell_reliquary_of_souls_aura_of_desire : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_reliquary_of_souls_aura_of_desire_AuraScript::OnProcSpell, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_reliquary_of_souls_aura_of_desire_AuraScript::UpdateAmount, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_reliquary_of_souls_aura_of_desire_AuraScript::UpdateAmount, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};