From 0f36736d422ecd0e90b21f74c83604642df2de46 Mon Sep 17 00:00:00 2001 From: Angelo Venturini Date: Wed, 3 Aug 2022 12:25:21 -0300 Subject: [PATCH] fix(Core): Freeze on Lord Jaraxxus (#12616) --- .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 7daf57746..ebf54535a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -118,11 +118,11 @@ public: if( pInstance ) pInstance->SetData(TYPE_JARAXXUS, NOT_STARTED); - // checked for safety - while( Creature* c = me->FindNearestCreature(NPC_INFERNAL_VOLCANO, 500.0f, true) ) - c->DespawnOrUnsummon(); - while( Creature* c = me->FindNearestCreature(NPC_NETHER_PORTAL, 500.0f, true) ) - c->DespawnOrUnsummon(); + std::list creatures; + me->GetCreatureListWithEntryInGrid(creatures, NPC_INFERNAL_VOLCANO, 500.f); + me->GetCreatureListWithEntryInGrid(creatures, NPC_NETHER_PORTAL, 500.f); + for (Creature* creature : creatures) + creature->DespawnOrUnsummon(); } void EnterCombat(Unit* /*who*/) override