From a56f89ab1b126007ff5d284ab86f260862698ddd Mon Sep 17 00:00:00 2001
From: megamage <none@none.none>
Date: Sun, 16 Oct 2011 16:51:45 -0400
Subject: [PATCH] Fix a crashed caused by mob_mistress_of_pain. Fix #3527.

---
 .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp            | 9 ++++++---
 1 file 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 ec573f75bc..df166c1bf0 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -490,12 +490,15 @@ public:
 
         void UpdateAI(const uint32 uiDiff)
         {
+            if (m_instance && m_instance->GetData(TYPE_JARAXXUS) != IN_PROGRESS)
+            {
+                me->DespawnOrUnsummon();
+                return;
+            }
+
             if (!UpdateVictim())
                 return;
 
-            if (m_instance && m_instance->GetData(TYPE_JARAXXUS) != IN_PROGRESS)
-                me->DespawnOrUnsummon();
-
             if (m_uiShivanSlashTimer <= uiDiff)
             {
                 DoCastVictim(SPELL_SHIVAN_SLASH);