Borean Tundra: Improvements in lurgglbrAI by Kudlaty.

--HG--
branch : trunk

1 files changed, 9 insertions, 3 deletions

diff --git a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp
index c6bc36c2979..539240caf8a 100644
--- a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp
+++ b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp
@@ -777,15 +777,18 @@ enum eLurgglbr
 
 struct TRINITY_DLL_DECL npc_lurgglbrAI : public npc_escortAI
 {
-    npc_lurgglbrAI(Creature* c) : npc_escortAI(c){}
+    npc_lurgglbrAI(Creature* pCreature) : npc_escortAI(pCreature){}
 
     uint32 IntroTimer;
     uint32 IntroPhase;
 
     void Reset()
     {
-        IntroTimer = 0;
-        IntroPhase = 0;
+        if (!HasEscortState(STATE_ESCORT_ESCORTING))
+        {
+            IntroTimer = 0;
+            IntroPhase = 0;
+        }
     }
 
     void WaypointReached(uint32 i)
@@ -853,6 +856,9 @@ struct TRINITY_DLL_DECL npc_lurgglbrAI : public npc_escortAI
             } else IntroTimer -= diff;
         }
         npc_escortAI::UpdateAI(diff);
+
+        if (!UpdateVictim())
+            return;
     }
 };