From dfef83ee3e67974c24c19be0ad4412d3d61066ca Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 29 Mar 2020 00:57:22 +0100 Subject: [PATCH] Scripts/GB: correct handling for Forgemaster Throngus' Personal Phalanx damage reduction --- .../GrimBatol/boss_forgemaster_throngus.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp index af4a2dd79ad..4925e089775 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp @@ -152,12 +152,6 @@ class boss_forgemaster_throngus : public CreatureScript _DespawnAtEvade(); } - void DamageTaken(Unit* attacker, uint32& damage) override - { - if (Aura* glancingBlowsAura = attacker->GetAura(SPELL_GLANCING_BLOWS)) - damage += CalculatePct(damage, glancingBlowsAura->GetSpellInfo()->Effects[EFFECT_0].BasePoints); - } - void DoAction(int32 action) override { switch (action) @@ -480,13 +474,18 @@ class spell_throngus_personal_phalanx : public SpellScriptLoader if (Creature * throngus = target->ToCreature()) if (throngus->IsAIEnabled) throngus->AI()->DoAction(ACTION_START_PHALLANX); + + target->ModifyAuraState(AURA_STATE_UNKNOWN22, true); } void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Creature* throngus = GetTarget()->ToCreature()) + Unit* target = GetTarget(); + if (Creature* throngus = target->ToCreature()) if (throngus->IsAIEnabled) throngus->AI()->DoAction(ACTION_END_PHALLANX); + + target->ModifyAuraState(AURA_STATE_UNKNOWN22, false); } void Register() override