asd

Author: ccrs

src/server/game/Entities/Creature/Creature.cpp

@@ -3086,7 +3086,7 @@ void Creature::SetSpellFocus(Spell const* focusSpell, WorldObject const* target)
 
     // If we are not allowed to turn during cast but have a focus target, face the target
     if (!turnDisabled && noTurnDuringCast && target)
-        SetFacingToObject(target, false, Milliseconds(focusSpell->GetCastTime()), EVENT_SPELL_FOCUS);
+        SetFacingToObject(target, false, EVENT_SPELL_FOCUS, Milliseconds(focusSpell->GetCastTime()));
 
     if (noTurnDuringCast)
         AddUnitState(UNIT_STATE_FOCUSING);
@@ -3148,10 +3148,10 @@ void Creature::ReacquireSpellFocusTarget()
         if (!_spellFocusInfo.Target.IsEmpty())
         {
             if (WorldObject const* objTarget = ObjectAccessor::GetWorldObject(*this, _spellFocusInfo.Target))
-                SetFacingToObject(objTarget, false, 1ms, EVENT_SPELL_FOCUS);
+                SetFacingToObject(objTarget, false, EVENT_SPELL_FOCUS);
         }
         else
-            SetFacingTo(_spellFocusInfo.Orientation.value(), false, 1ms, EVENT_SPELL_FOCUS);
+            SetFacingTo(_spellFocusInfo.Orientation.value(), false, EVENT_SPELL_FOCUS);
     }
     _spellFocusInfo.Delay = 0;
     _spellFocusInfo.Target.Clear();

src/server/game/Entities/Unit/Unit.cpp

@@ -13242,7 +13242,7 @@ void Unit::SetInFront(WorldObject const* target)
         SetOrientation(GetAbsoluteAngle(target));
 }
 
-void Unit::SetFacingTo(float ori, bool force/* = true*/, Milliseconds duration/* = 1s*/, uint32 id/* = EVENT_FACE*/)
+void Unit::SetFacingTo(float ori, bool force/* = true*/, uint32 id/* = EVENT_FACE*/, Milliseconds duration/* = 0ms*/)
 {
     // do not face when already moving
     if (!force && (!IsStopped() || !movespline->Finalized() || GetMotionMaster()->GetCurrentMovementGeneratorPriority() == MOTION_PRIORITY_HIGHEST))
@@ -13251,7 +13251,7 @@ void Unit::SetFacingTo(float ori, bool force/* = true*/, Milliseconds duration/*
     GetMotionMaster()->MoveFace(ori, duration, id);
 }
 
-void Unit::SetFacingToObject(WorldObject const* object, bool force/* = true*/, Milliseconds duration/* = 1s*/, uint32 id/* = EVENT_FACE*/)
+void Unit::SetFacingToObject(WorldObject const* object, bool force/* = true*/, uint32 id/* = EVENT_FACE*/, Milliseconds duration/* = 0ms*/)
 {
     // do not face when already moving
     if (!force && (!IsStopped() || !movespline->Finalized() || GetMotionMaster()->GetCurrentMovementGeneratorPriority() == MOTION_PRIORITY_HIGHEST))

src/server/game/Entities/Unit/Unit.h

@@ -1228,8 +1228,8 @@ class TC_GAME_API Unit : public WorldObject
         bool SetHover(bool enable, bool updateAnimTier = true);
 
         void SetInFront(WorldObject const* target);
-        void SetFacingTo(float const ori, bool force = true, Milliseconds duration = 1s, uint32 id = EVENT_FACE);
-        void SetFacingToObject(WorldObject const* object, bool force = true, Milliseconds duration = 1s, uint32 id = EVENT_FACE);
+        void SetFacingTo(float const ori, bool force = true, uint32 id = EVENT_FACE, Milliseconds duration = 0ms);
+        void SetFacingToObject(WorldObject const* object, bool force = true, uint32 id = EVENT_FACE, Milliseconds duration = 0ms);
 
         void BuildHeartBeatMsg(WorldPacket* data) const;
 

src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp

@@ -661,7 +661,7 @@ struct boss_the_lich_king : public BossAI
             me->SetReactState(REACT_PASSIVE);
             me->AttackStop();
             me->InterruptNonMeleeSpells(true);
-            me->GetMotionMaster()->MovePoint(POINT_CENTER_2, CenterPosition);
+            me->GetMotionMaster()->MovePoint(POINT_CENTER_3, CenterPosition);
             return;
         }
 
@@ -786,7 +786,7 @@ struct boss_the_lich_king : public BossAI
 
     void MovementInform(uint32 type, uint32 pointId) override
     {
-        if (type != POINT_MOTION_TYPE)
+        if (type != POINT_MOTION_TYPE && type != EFFECT_MOTION_TYPE)
             return;
 
         switch (pointId)
@@ -804,7 +804,7 @@ struct boss_the_lich_king : public BossAI
                 events.ScheduleEvent(EVENT_INTRO_TALK_1, 9s, 0, PHASE_INTRO);
                 break;
             case POINT_CENTER_1:
-                me->SetFacingTo(0.0f, true, 100ms, POINT_CENTER_2);
+                me->SetFacingTo(0.0f, true, POINT_CENTER_2);
                 break;
             case POINT_CENTER_2:
                 Talk(SAY_LK_REMORSELESS_WINTER);
@@ -820,7 +820,7 @@ struct boss_the_lich_king : public BossAI
                 events.ScheduleEvent(EVENT_SOUL_REAPER, 94s, 0, PHASE_TWO);
                 break;
             case POINT_CENTER_3:
-                me->SetFacingTo(0.0f, true, 100ms, POINT_CENTER_4);
+                me->SetFacingTo(0.0f, true, POINT_CENTER_4);
                 break;
             case POINT_CENTER_4:
                 Talk(SAY_LK_REMORSELESS_WINTER);