separate

Author: ccrs

src/server/game/Entities/Player/Player.cpp

@@ -1571,6 +1571,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
     SetUnitMovementFlags(GetUnitMovementFlags() & MOVEMENTFLAG_MASK_HAS_PLAYER_STATUS_OPCODE);
     DisableSpline();
     GetMotionMaster()->Remove(EFFECT_MOTION_TYPE);
+    GetMotionMaster()->Remove(FACE_MOTION_TYPE);
 
     if (Transport* transport = GetTransport())
     {

src/server/game/Movement/MotionMaster.cpp

@@ -1097,7 +1097,7 @@ void MotionMaster::MoveFace(WorldObject const* object, Milliseconds duration/* =
             init.SetFacing(_owner->GetAbsoluteAngle(object));   // when on transport, GetAbsoluteAngle will still return global coordinates (and angle) that needs transforming
     };
 
-    GenericMovementGenerator* movement = new GenericMovementGenerator(std::move(initializer), EFFECT_MOTION_TYPE, id, duration);
+    GenericMovementGenerator* movement = new GenericMovementGenerator(std::move(initializer), FACE_MOTION_TYPE, id, duration);
     movement->Priority = MOTION_PRIORITY_NORMAL;
     movement->Mode = MOTION_MODE_OVERRIDE;
     movement->BaseUnitState = UNIT_STATE_FACING;
@@ -1120,7 +1120,7 @@ void MotionMaster::MoveFace(float const orientation, Milliseconds duration/* = 1
         init.SetFacing(orientation);
     };
 
-    GenericMovementGenerator* movement = new GenericMovementGenerator(std::move(initializer), EFFECT_MOTION_TYPE, id, duration);
+    GenericMovementGenerator* movement = new GenericMovementGenerator(std::move(initializer), FACE_MOTION_TYPE, id, duration);
     movement->Priority = MOTION_PRIORITY_NORMAL;
     movement->Mode = MOTION_MODE_OVERRIDE;
     movement->BaseUnitState = UNIT_STATE_FACING;

src/server/game/Movement/MovementDefines.h

@@ -44,6 +44,7 @@ enum MovementGeneratorType : uint8
     EFFECT_MOTION_TYPE              = 16,
     SPLINE_CHAIN_MOTION_TYPE        = 17,    // SplineChainMovementGenerator.h
     FORMATION_MOTION_TYPE           = 18,    // FormationMovementGenerator.h
+    FACE_MOTION_TYPE                = 19,
     MAX_MOTION_TYPE                          // SKIP
 };
 

src/server/game/Movement/enuminfo_MovementDefines.cpp

@@ -50,6 +50,7 @@ TC_API_EXPORT EnumText EnumUtils<MovementGeneratorType>::ToString(MovementGenera
         case EFFECT_MOTION_TYPE: return { "EFFECT_MOTION_TYPE", "EFFECT_MOTION_TYPE", "" };
         case SPLINE_CHAIN_MOTION_TYPE: return { "SPLINE_CHAIN_MOTION_TYPE", "SPLINE_CHAIN_MOTION_TYPE", "SplineChainMovementGenerator.h" };
         case FORMATION_MOTION_TYPE: return { "FORMATION_MOTION_TYPE", "FORMATION_MOTION_TYPE", "FormationMovementGenerator.h" };
+        case FACE_MOTION_TYPE: return { "FACE_MOTION_TYPE", "FACE_MOTION_TYPE", "" };
         default: throw std::out_of_range("value");
     }
 }
@@ -81,6 +82,7 @@ TC_API_EXPORT MovementGeneratorType EnumUtils<MovementGeneratorType>::FromIndex(
         case 16: return EFFECT_MOTION_TYPE;
         case 17: return SPLINE_CHAIN_MOTION_TYPE;
         case 18: return FORMATION_MOTION_TYPE;
+        case 19: return FACE_MOTION_TYPE;
         default: throw std::out_of_range("index");
     }
 }
@@ -109,6 +111,7 @@ TC_API_EXPORT size_t EnumUtils<MovementGeneratorType>::ToIndex(MovementGenerator
         case EFFECT_MOTION_TYPE: return 16;
         case SPLINE_CHAIN_MOTION_TYPE: return 17;
         case FORMATION_MOTION_TYPE: return 18;
+        case FACE_MOTION_TYPE: return 19;
         default: throw std::out_of_range("value");
     }
 }