From 80dbecbd56a9679a2e29f22f8f554ec2caa1c554 Mon Sep 17 00:00:00 2001 From: Keader Date: Mon, 30 Dec 2019 11:26:07 -0300 Subject: Scripts/ICC: Fixed Valithria Archmages casting while dead After 9c603ea87f09c47d52f093ccc73ee75c15eff6f5, dead creatures will tick UpdateAI Closes: #24012 (cherry picked from commit 2f31119ea337aedecc593b6bb687ad73390db3a2) --- .../scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index f16eb9c73e6..d95423434e6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -714,7 +714,7 @@ class npc_risen_archmage : public CreatureScript void JustEngagedWith(Unit* target) override { - me->FinishSpell(CURRENT_CHANNELED_SPELL, false); + me->InterruptNonMeleeSpells(false); if (_isInitialArchmage && _canCallJustEngagedWith) { if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_VALITHRIA_LICH_KING))) @@ -759,7 +759,7 @@ class npc_risen_archmage : public CreatureScript void UpdateAI(uint32 diff) override { - if (!me->IsInCombat() && _isInitialArchmage && !me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) + if (!me->IsInCombat() && me->IsAlive() && _isInitialArchmage && !me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) DoCastSelf(SPELL_CORRUPTION); if (!UpdateVictim()) -- cgit v1.2.3