From 7c01638d45b3eaed7af124a43f21cc6d15407667 Mon Sep 17 00:00:00 2001
From: mik1893 <michele.roscelli@gmail.com>
Date: Sat, 27 Jun 2015 22:07:57 +0200
Subject: [PATCH] Scripts/VioletHold: fix a crash during Ichoron encounter
 Closes #14962

---
 src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
index 74f54355af05f..137f63a381db9 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
@@ -456,6 +456,7 @@ class npc_ichor_globule : public CreatureScript
             Initialize();
             events.Reset();
             DoCast(SPELL_WATER_GLOBULE);
+            me->SetReactState(REACT_PASSIVE);
         }
 
         void SetData(uint32 id, uint32 data) override
@@ -475,11 +476,11 @@ class npc_ichor_globule : public CreatureScript
             switch (id)
             {
                 case 0:
-                    me->GetMotionMaster()->MovementExpired();
+                    me->GetMotionMaster()->Clear();
                     events.ScheduleEvent(EVENT_GLOBULE_MOVE, 500);
                     break;
                 case 1:
-                    me->GetMotionMaster()->MovementExpired();
+                    me->GetMotionMaster()->Clear();
                     if (Creature* ichoron = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_ICHORON)))
                         me->GetMotionMaster()->MoveFollow(ichoron, 0.0f, 0.0f);
                     break;