aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeader <keader.android@gmail.com>2017-03-20 16:49:42 -0300
committerKeader <keader.android@gmail.com>2017-03-20 16:49:42 -0300
commit333a4034099e262db8db0a1736d01c30a8cf9d52 (patch)
treea96833506694ac077a43a87f3e0c5044109e295b
parent81d011170d48e7d4cce7892897d24528254615af (diff)
Core/Scripts: Fixed wrong calculation of Aura of Desire
Closes #19322
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index d2f7d04d330..d5f52b2fc7c 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -346,6 +346,8 @@ public:
Talk(SUFF_SAY_RECAP);
me->AttackStop();
me->SetReactState(REACT_PASSIVE);
+ events.Reset();
+ me->InterruptNonMeleeSpells(false);
me->GetMotionMaster()->MovePoint(RELIQUARY_DESPAWN_WAYPOINT, DespawnPoint);
}
}
@@ -474,6 +476,8 @@ public:
Talk(DESI_SAY_RECAP);
me->AttackStop();
me->SetReactState(REACT_PASSIVE);
+ events.Reset();
+ me->InterruptNonMeleeSpells(false);
me->GetMotionMaster()->MovePoint(RELIQUARY_DESPAWN_WAYPOINT, DespawnPoint);
}
}
@@ -740,7 +744,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);
@@ -749,7 +753,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);
}
};