Fix a crashed caused by mob_mistress_of_pain. Fix #3527.

1 files changed, 6 insertions, 3 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 ec573f75bc6..df166c1bf04 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -490,11 +490,14 @@ public:
 
         void UpdateAI(const uint32 uiDiff)
         {
-            if (!UpdateVictim())
-                return;
-
             if (m_instance && m_instance->GetData(TYPE_JARAXXUS) != IN_PROGRESS)
+            {
                 me->DespawnOrUnsummon();
+                return;
+            }
+
+            if (!UpdateVictim())
+                return;
 
             if (m_uiShivanSlashTimer <= uiDiff)
             {