2 files changed, 7 insertions, 14 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index cf1bb05206..eb346d24e2 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -19586,12 +19586,6 @@ void Unit::_ExitVehicle(Position const* exitPosition)
 
         sScriptMgr->AnticheatSetUnderACKmount(player);
     }
-    else if (HasUnitMovementFlag(MOVEMENTFLAG_ROOT))
-    {
-        WorldPacket data(SMSG_SPLINE_MOVE_UNROOT, 8);
-        data << GetPackGUID();
-        SendMessageToSet(&data, false);
-    }
 
     // xinef: hack for flameleviathan seat vehicle
     VehicleEntry const* vehicleInfo = vehicle->GetVehicleInfo();
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
index ec4dd204c5..f840eb5342 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -133,13 +133,13 @@ struct boss_anub_arak : public BossAI
             DoCastSelf(SPELL_IMPALE_PERIODIC, true);
 
             ++_submergePhase;
+            events.Reset();
             ScheduleSubmerged();
         }
     }
 
     void ScheduleEmerged()
     {
-        events.Reset();
         events.SetPhase(PHASE_EMERGED);
         events.ScheduleEvent(EVENT_CARRION_BEETLES, 6500ms, 0, PHASE_EMERGED);
         events.ScheduleEvent(EVENT_LEECHING_SWARM, 20s, 0, PHASE_EMERGED);
@@ -148,7 +148,6 @@ struct boss_anub_arak : public BossAI
 
     void ScheduleSubmerged()
     {
-        events.Reset();
         events.SetPhase(PHASE_SUBMERGED);
         events.ScheduleEvent(EVENT_EMERGE, 60s, 0, PHASE_SUBMERGED);
 
@@ -209,14 +208,13 @@ struct boss_anub_arak : public BossAI
         }
     }
 
-    void JustEngagedWith(Unit* who) override
+    void JustEngagedWith(Unit* /*who*/) override
     {
-        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
 
         events.SetPhase(PHASE_EMERGED);
-        events.ScheduleEvent(EVENT_CLOSE_DOORS, 5s);
+        events.ScheduleEvent(EVENT_CLOSE_DOORS, 5s, 0, PHASE_EMERGED);
         ScheduleEmerged();
 
         // set up world triggers
@@ -288,7 +286,8 @@ struct boss_anub_arak : public BossAI
                 if (_remainingLargeSummonsBeforeEmerge == 0)
                 {
                         events.Reset();
-                        events.ScheduleEvent(EVENT_EMERGE, 5s);
+                        events.SetPhase(PHASE_SUBMERGED);
+                        events.ScheduleEvent(EVENT_EMERGE, 5s, 0, PHASE_SUBMERGED);
                 }
                 break;
             }
@@ -333,10 +332,10 @@ struct boss_anub_arak : public BossAI
                     DoCastSelf(SPELL_SELF_ROOT, true);
                     me->DisableRotate(true);
                     me->SendMovementFlagUpdate();
-                    events.ScheduleEvent(EVENT_ENABLE_ROTATE, 3300ms);
+                    events.ScheduleEvent(EVENT_ENABLE_ROTATE, 3300ms, 0, PHASE_EMERGED);
                     DoCast(target, SPELL_POUND);
                 }
-                events.ScheduleEvent(EVENT_POUND, 18s);
+                events.ScheduleEvent(EVENT_POUND, 18s, 0, PHASE_EMERGED);
                 break;
             case EVENT_ENABLE_ROTATE:
                 me->RemoveAurasDueToSpell(SPELL_SELF_ROOT);