From 9abdc4ee3d819a992ac998bfb565d4a403308e5a Mon Sep 17 00:00:00 2001 From: Keader Date: Wed, 2 Oct 2019 16:50:45 -0300 Subject: Scripts/ICC: Fixed Tear Gas not getting removed of Abomination in phase change of PP (#23846) (cherry picked from commit 16fde1ffad38306f1f21eab6496f4826d6ed3498) --- .../Northrend/IcecrownCitadel/boss_professor_putricide.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index f81d31c2602..37c84759489 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -623,7 +623,6 @@ class boss_professor_putricide : public CreatureScript AttackStart(me->GetVictim()); // remove Tear Gas me->RemoveAurasDueToSpell(SPELL_TEAR_GAS_PERIODIC_TRIGGER); - instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_TEAR_GAS_TRIGGER_MISSILE, true, true); DoCastAOE(SPELL_TEAR_GAS_CANCEL); instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_GAS_VARIABLE); instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_OOZE_VARIABLE); @@ -1602,7 +1601,14 @@ class spell_putricide_clear_aura_effect_value : public SpellScriptLoader void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - GetHitUnit()->RemoveAurasDueToSpell(GetEffectValue()); + Unit* target = GetHitUnit(); + uint32 auraId = GetEffectValue(); + target->RemoveAurasDueToSpell(auraId); + if (m_scriptSpellId == SPELL_TEAR_GAS_CANCEL && GetSpellInfo()->GetEffects().size() >= EFFECT_1) + { + uint32 auraId2 = GetSpellInfo()->GetEffect(EFFECT_1).CalcValue(); + target->RemoveAurasDueToSpell(auraId2); + } } void Register() override -- cgit v1.2.3