From 77d13a7b97d4b9d243ce753ca02ae94d9e10b17e Mon Sep 17 00:00:00 2001 From: Treeston Date: Fri, 15 Sep 2017 00:22:18 +0200 Subject: Scripts/Patchwerk: Finally fix that crash for real. Closes #20247. (cherry picked from commit 49daef4b77baca7266e9a0ea7c916318ba6af6b0) --- src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 22cc46fae4a..70d554420d9 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; } -- cgit v1.2.3