From 7c19c96429eb8e34da24a304d5f2bf8461be3806 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Mon, 22 Nov 2021 18:29:30 +0100 Subject: [PATCH] fix(Scripts/MoltenCore): Majordomus improvements: (#9232) Magic Reflection/Damage Shield should be usable on adds. Adds should not despawn on boss defeat. Fixes #9120 --- .../pending_db_world/rev_1637182861061114100.sql | 10 ++++++++++ .../MoltenCore/boss_majordomo_executus.cpp | 13 +------------ 2 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1637182861061114100.sql diff --git a/data/sql/updates/pending_db_world/rev_1637182861061114100.sql b/data/sql/updates/pending_db_world/rev_1637182861061114100.sql new file mode 100644 index 000000000..7b9a01be2 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1637182861061114100.sql @@ -0,0 +1,10 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1637182861061114100'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (20619,21075); +INSERT INTO `conditions` VALUES +(13,1,20619,0,0,31,0,3,11663,0,0,0,0,'','Magic Reflection targets Flamewaker Healer'), +(13,1,20619,0,1,31,0,3,11664,0,0,0,0,'','Magic Reflection targets Flamewaker Elite'), +(13,1,21075,0,0,31,0,3,11663,0,0,0,0,'','Damage Shield targets Flamewaker Healer'), +(13,1,21075,0,1,31,0,3,11664,0,0,0,0,'','Damage Shield targets Flamewaker Elite'); + +UPDATE `creature_summon_groups` SET `summonType`=7 WHERE `summonerId`=12018 AND `groupid`=1; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp index d02913f47..4282c1ab8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp @@ -256,18 +256,7 @@ public: } else if (!remainingAdds) { - if (!static_minionsGUIDS.empty()) - { - for (ObjectGuid const& guid : static_minionsGUIDS) - { - if (Creature* minion = ObjectAccessor::GetCreature(*me, guid)) - { - minion->DespawnOrUnsummon(); - } - } - - static_minionsGUIDS.clear(); - } + static_minionsGUIDS.clear(); instance->SetBossState(DATA_MAJORDOMO_EXECUTUS, DONE); events.CancelEventGroup(PHASE_COMBAT);