aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2017-09-11 16:13:35 +0200
committerTreeston <treeston.mmoc@gmail.com>2017-09-11 16:13:35 +0200
commit50e8de103b65be3addb1f0fefb4ed4bf13d5a30a (patch)
tree4131e64a7a4ed48b365b0fdffb19bc8b1f8c2339
parent62f7debffdb0a45cec0744ddb29460214febc9b8 (diff)
Scripts/Naxxramas: Fix an edge case crash with people teleporting out of the dungeon during the Patchwerk encounter (tagging #20247)
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
index eeb5f7b18bc..d3b9da4f99d 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
@@ -131,11 +131,11 @@ public:
if ((*it)->GetVictim() != currentVictim)
secondThreat = *it;
- if ((!secondThreat || Is25ManRaid()) && (++it != end))
+ if ((!secondThreat || Is25ManRaid()) && (++it != end && (*it)->IsAvailable()))
{
if ((*it)->GetVictim() != currentVictim)
(secondThreat ? thirdThreat : secondThreat) = *it;
- if (!thirdThreat && Is25ManRaid() && (++it != end))
+ if (!thirdThreat && Is25ManRaid() && (++it != end && (*it)->IsAvailable()))
thirdThreat = *it;
}