From e1e8cc1bf5a8367bdb9ba46d35ea822b62a78e48 Mon Sep 17 00:00:00 2001 From: Petric Date: Mon, 31 Aug 2020 16:27:01 +0100 Subject: [PATCH] fix(CORE/Raid): Muradin/Saurfang not de-spawning after finishing movement (#3294) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Saurfang and Muradin together with its 3 followers were not de-spawning once reaching the exit portal after the initial RP moment and remain standing in front of the exit portal forever. Partially Closes https://github.com/azerothcore/azerothcore-wotlk/issues/3246 Co-authored-by: Francesco Borzì Co-authored-by: Stefano Borzì --- .../Northrend/IcecrownCitadel/icecrown_citadel.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 39454b256..4a3a75f27 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -516,7 +516,16 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript case EVENT_MURADIN_RUN: case EVENT_SAURFANG_RUN: if (Creature* factionNPC = ObjectAccessor::GetCreature(*me, _factionNPC)) - factionNPC->GetMotionMaster()->MovePath(factionNPC->GetDBTableGUIDLow()*10, false); + { + factionNPC->GetMotionMaster()->MovePath(factionNPC->GetDBTableGUIDLow() * 10, false); + factionNPC->DespawnOrUnsummon(46500); + std::list followers; + factionNPC->GetCreaturesWithEntryInRange(followers, 30, _instance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? NPC_KOR_KRON_GENERAL : NPC_ALLIANCE_COMMANDER); + for (Creature* follower : followers) + { + follower->DespawnOrUnsummon(46500); + } + } me->setActive(false); _damnedKills = 3; break;