From 4a3e2845458935721a8f16103d9592da15370b64 Mon Sep 17 00:00:00 2001 From: Viger Date: Wed, 15 May 2024 00:59:14 +0200 Subject: [PATCH] Blackwing Lair Razorgore Mind Exhaustion debuff along with responsive adds fix --- .../blackwing_lair/blackwing_lair.cpp | 1 + .../blackwing_lair/boss_razorgore.cpp | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/blackwing_lair/blackwing_lair.cpp b/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/blackwing_lair/blackwing_lair.cpp index 5e90141311..bdd58c194e 100644 --- a/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/blackwing_lair/blackwing_lair.cpp +++ b/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/blackwing_lair/blackwing_lair.cpp @@ -422,6 +422,7 @@ void instance_blackwing_lair::OnCreatureRespawn(Creature* creature) { creature->SetNoLoot(true); creature->SetCorpseDelay(5); + creature->SetInCombatWithZone(); return; } diff --git a/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp b/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp index ebf211a33e..192dab3b47 100644 --- a/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp +++ b/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp @@ -272,15 +272,20 @@ struct PossessRazorgore : public AuraScript { if (apply) { - if (Unit* caster = aura->GetCaster()) - caster->CastSpell(caster, SPELL_MIND_EXHAUSTION, TRIGGERED_OLD_TRIGGERED); aura->GetTarget()->CastSpell(nullptr, SPELL_DRAGON_ORB, TRIGGERED_OLD_TRIGGERED); } else { - Unit* target = aura->GetTarget(); - target->RemoveAurasDueToSpell(SPELL_POSSESS_VISUAL); - target->RemoveAurasDueToSpell(SPELL_DRAGON_ORB); + if (Unit* caster = aura->GetCaster()) + { + caster->CastSpell(caster, SPELL_MIND_EXHAUSTION, TRIGGERED_OLD_TRIGGERED); + } + + if (Unit* target = aura->GetTarget()) + { + target->RemoveAurasDueToSpell(SPELL_POSSESS_VISUAL); + target->RemoveAurasDueToSpell(SPELL_DRAGON_ORB); + } } } }