From 61f3d51143b51b04169bd1c2ff0393d2b9be7c33 Mon Sep 17 00:00:00 2001
From: NoName <322016+Faq@users.noreply.github.com>
Date: Fri, 28 Feb 2020 20:03:52 +0200
Subject: Core/Movement: Implement MoveSplineFlag::Enter_Cycle (#24049)

by xvwyh

(cherry picked from commit 40542f01e3fec0bff2c6e5eadbe20e58f19b0fd8)
---
 src/server/game/Movement/MotionMaster.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/server/game/Movement/MotionMaster.cpp')

diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index a1ca939c1b4..28c991a3c8d 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -859,6 +859,9 @@ void MotionMaster::MoveCirclePath(float x, float y, float z, float radius, bool
 
     Movement::MoveSplineInit init(_owner);
 
+    // add the owner's current position as starting point as it gets removed after entering the cycle
+    init.Path().push_back(G3D::Vector3(_owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ()));
+
     for (uint8 i = 0; i < stepCount; angle += step, ++i)
     {
         G3D::Vector3 point;
-- 
cgit v1.2.3