From c62f4e891b6e4a22c70eb8ee0c76b5cb4679a614 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Mon, 27 Jul 2020 01:22:35 +0200 Subject: [PATCH] Scripts/BWD: apply the Mangle kill aura and Sweltering Armor after the player has entered Magmaw instead of when being hit by the damage at the same time --- .../BlackwingDescent/boss_magmaw.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp index 9e1de4b0e6..793072c6fb 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp @@ -236,6 +236,9 @@ struct boss_magmaw : public BossAI { if (apply) { + passenger->CastSpell(passenger, SPELL_MANGLE_2, true); + passenger->CastSpell(passenger, SPELL_SWELTERING_ARMOR, true); + if (Player* player = passenger->ToPlayer()) player->Whisper(BROADCAST_TEXT_WHISPER_MANGLE, player, true); } @@ -855,12 +858,7 @@ class spell_magmaw_mangle : public SpellScript bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo( - { - SPELL_MANGLE_1, - SPELL_MANGLE_2, - SPELL_SWELTERING_ARMOR - }); + return ValidateSpellInfo({ SPELL_MANGLE_1 }); } void FilterTargets(std::list& targets) @@ -879,8 +877,6 @@ class spell_magmaw_mangle : public SpellScript Unit* target = GetHitUnit(); caster->CastSpell(target, SPELL_MANGLE_1, true); - target->CastSpell(target, SPELL_MANGLE_2, true); - target->CastSpell(target, SPELL_SWELTERING_ARMOR, true); } void Register() override