From 321a9d2b0ac9f6077e133f60c79ad757520dfc90 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 1 Oct 2020 21:00:45 +0200 Subject: [PATCH] Scripts/Ulduar: added more cleanup mechanics to Runemaster Molgeim --- .../Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp | 2 ++ .../scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp | 6 +++++- src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h | 7 ++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index a06d14050fe..d5e7ec987bd 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -370,6 +370,8 @@ struct boss_runemaster_molgeim : public ScriptedAI if (_events.IsInPhase(PHASE_THREE)) { EncounterHelper::CleanupAuras(this, _instance); + _summons.DespawnAll(); + me->RemoveAllDynObjects(); _instance->SetBossState(DATA_ASSEMBLY_OF_IRON, DONE); DoCastAOE(SPELL_KILL_CREDIT, true); Talk(SAY_MOLGEIM_ENCOUNTER_DEFEATED); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 866a02cd471..ee4c6af4d14 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -400,7 +400,11 @@ class instance_ulduar : public InstanceMapScript case NPC_SANITY_WELL: creature->SetReactState(REACT_PASSIVE); break; - + case NPC_RUNE_OF_POWER: + if (Creature* molgeim = GetCreature(DATA_RUNEMASTER_MOLGEIM)) + if (molgeim->IsAIEnabled) + molgeim->AI()->JustSummoned(creature); + break; // Algalon //! These creatures are summoned by something else than Algalon //! but need to be controlled/despawned by him - so they need to be diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index 3a7df5df2e6..a02f0fd9513 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -80,9 +80,10 @@ enum UlduarNPCs NPC_ALGALON = 32871, // Assembly of Iron - BOSS_STEELBREAKER = 32867, - BOSS_RUNEMASTER_MOLGEIM = 32927, - BOSS_STORMCALLER_BRUNDIR = 32857, + BOSS_STEELBREAKER = 32867, + BOSS_RUNEMASTER_MOLGEIM = 32927, + BOSS_STORMCALLER_BRUNDIR = 32857, + NPC_RUNE_OF_POWER = 33705, //XT002 NPC_XS013_SCRAPBOT = 33343,