aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2017-09-15 00:22:18 +0200
committerTreeston <treeston.mmoc@gmail.com>2017-09-15 00:22:18 +0200
commit49daef4b77baca7266e9a0ea7c916318ba6af6b0 (patch)
tree7fe5e3007b183b56a7d0fd591f5f4851f2ff330c /src
parent42be04898c6fd001160ee4fdf00fc2ba5c5c1ee3 (diff)
Scripts/Patchwerk: Finally fix that crash for real. Closes #20247.
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
index d3b9da4f99d..adce3c76070 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
@@ -127,7 +127,10 @@ public:
auto list = mgr.GetModifiableThreatList();
auto it = list.begin(), end = list.end();
if (it == end)
+ {
EnterEvadeMode(EVADE_REASON_NO_HOSTILES);
+ return;
+ }
if ((*it)->GetVictim() != currentVictim)
secondThreat = *it;
@@ -147,8 +150,6 @@ public:
else
pHatefulTarget = (secondThreat->GetVictim()->GetHealth() < thirdThreat->GetVictim()->GetHealth()) ? thirdThreat->GetVictim() : secondThreat->GetVictim();
- DoCast(pHatefulTarget, SPELL_HATEFUL_STRIKE, true);
-
// add threat to highest threat targets
AddThreat(currentVictim, HATEFUL_THREAT_AMT);
if (secondThreat)
@@ -156,6 +157,8 @@ public:
if (thirdThreat)
thirdThreat->AddThreat(HATEFUL_THREAT_AMT);
+ DoCast(pHatefulTarget, SPELL_HATEFUL_STRIKE, true);
+
events.Repeat(Seconds(1));
break;
}