Merge branch '3.3.5' into ccrs_movementfacing

Author: Shauren

src/server/game/Movement/MotionMaster.cpp

@@ -1033,32 +1033,32 @@ void MotionMaster::MoveFormation(Unit* leader, float range, float angle, uint32
     }
 }
 
-void MotionMaster::MoveFace(WorldObject const* object, uint32 id /*= EVENT_FACE*/)
+void MotionMaster::MoveFace(float orientation, uint32 id /*= EVENT_FACE*/)
 {
-    if (!object)
-        return;
-
-    TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFace: '{}', faces '{}'", _owner->GetGUID(), object->GetGUID());
+    TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFace: '{}', faces '{}'", _owner->GetGUID(), orientation);
 
-    std::function<void(Movement::MoveSplineInit&)> initializer = [owner = _owner, object](Movement::MoveSplineInit& init)
+    std::function<void(Movement::MoveSplineInit&)> initializer = [owner = _owner, orientation](Movement::MoveSplineInit& init)
     {
         init.MoveTo(owner->GetPositionX(), owner->GetPositionY(), owner->GetPositionZ(), false);
-        init.SetFacing(owner->GetAbsoluteAngle(object));    // when on transport, GetAbsoluteAngle will still return global coordinates (and angle) that needs transforming
+        if (owner->GetTransport())
+            init.DisableTransportPathTransformations();     // It makes no sense to target global orientation
+        init.SetFacing(orientation);
     };
 
     Add(new ImmediateMovementGenerator(std::move(initializer), FACE_MOTION_TYPE, id));
 }
 
-void MotionMaster::MoveFace(float orientation, uint32 id /*= EVENT_FACE*/)
+void MotionMaster::MoveFace(WorldObject const* object, uint32 id /*= EVENT_FACE*/)
 {
-    TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFace: '{}', faces '{}'", _owner->GetGUID(), orientation);
+    if (!object)
+        return;
 
-    std::function<void(Movement::MoveSplineInit&)> initializer = [owner = _owner, orientation](Movement::MoveSplineInit& init)
+    TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFace: '{}', faces '{}'", _owner->GetGUID(), object->GetGUID());
+
+    std::function<void(Movement::MoveSplineInit&)> initializer = [owner = _owner, object](Movement::MoveSplineInit& init)
     {
         init.MoveTo(owner->GetPositionX(), owner->GetPositionY(), owner->GetPositionZ(), false);
-        if (owner->GetTransport())
-            init.DisableTransportPathTransformations();     // It makes no sense to target global orientation
-        init.SetFacing(orientation);
+        init.SetFacing(owner->GetAbsoluteAngle(object));    // when on transport, GetAbsoluteAngle will still return global coordinates (and angle) that needs transforming
     };
 
     Add(new ImmediateMovementGenerator(std::move(initializer), FACE_MOTION_TYPE, id));

src/server/game/Movement/MotionMaster.h

@@ -190,8 +190,8 @@ class TC_GAME_API MotionMaster
         void MovePath(WaypointPath& path, bool repeatable);
         void MoveRotate(uint32 id, uint32 time, RotateDirection direction);
         void MoveFormation(Unit* leader, float range, float angle, uint32 point1, uint32 point2);
-        void MoveFace(WorldObject const* object, uint32 id = EVENT_FACE);
         void MoveFace(float orientation, uint32 id = EVENT_FACE);
+        void MoveFace(WorldObject const* object, uint32 id = EVENT_FACE);
 
         void LaunchMoveSpline(std::function<void(Movement::MoveSplineInit& init)>&& initializer, uint32 id = 0, MovementGeneratorPriority priority = MOTION_PRIORITY_NORMAL, MovementGeneratorType type = EFFECT_MOTION_TYPE);
     private:

src/server/game/Movement/enuminfo_MovementDefines.cpp

@@ -56,7 +56,7 @@ TC_API_EXPORT EnumText EnumUtils<MovementGeneratorType>::ToString(MovementGenera
 }
 
 template <>
-TC_API_EXPORT size_t EnumUtils<MovementGeneratorType>::Count() { return 19; }
+TC_API_EXPORT size_t EnumUtils<MovementGeneratorType>::Count() { return 20; }
 
 template <>
 TC_API_EXPORT MovementGeneratorType EnumUtils<MovementGeneratorType>::FromIndex(size_t index)