From 77eaa2c1ac650249243bb9934fc600225afeee31 Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Mon, 29 Jul 2019 08:22:58 +0200 Subject: Scripts/Blood Furnace: Fix infinite loop in Broggok encounter Fix infinite loop in Broggok encounter caused by https://github.com/TrinityCore/TrinityCore/pull/23300 (cherry picked from commit 30a4aca266be7cc065abb6f8ef79c3a3af2f5836) --- .../Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/server/scripts/Outland') diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 85dda6396a1..75e3f9d565a 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -209,6 +209,7 @@ class instance_blood_furnace : public InstanceMapScript void ResetPrisoners(GuidSet& prisoners) { for (GuidSet::const_iterator i = prisoners.begin(); i != prisoners.end();) + { if (Creature * prisoner = instance->GetCreature(*i)) { if (!prisoner->IsAlive()) @@ -218,6 +219,9 @@ class instance_blood_furnace : public InstanceMapScript ResetPrisoner(prisoner); } + else + ++i; + } } void ResetPrisoner(Creature* prisoner) -- cgit v1.2.3