From dfaf4f57a66727a638006dc986eff1a989206813 Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Mon, 30 Dec 2019 18:54:28 +0100 Subject: [PATCH] Core/Movement: Fix wrong orientation set when pausing movement --- src/server/game/Entities/Unit/Unit.cpp | 3 ++- src/server/game/Movement/Spline/MoveSpline.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index ecd54c92af..15989ca184 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11004,7 +11004,8 @@ void Unit::StopMoving() return; // Update position now since Stop does not start a new movement that can be updated later - UpdateSplinePosition(); + if (movespline->HasStarted()) + UpdateSplinePosition(); Movement::MoveSplineInit init(this); init.Stop(); } diff --git a/src/server/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h index eaa8a179e8..ca815f1fbe 100644 --- a/src/server/game/Movement/Spline/MoveSpline.h +++ b/src/server/game/Movement/Spline/MoveSpline.h @@ -122,6 +122,7 @@ namespace Movement Vector3 FinalDestination() const { return Initialized() ? spline.getPoint(spline.last()) : Vector3(); } Vector3 CurrentDestination() const { return Initialized() ? spline.getPoint(point_Idx + 1) : Vector3(); } int32 currentPathIdx() const; + bool HasStarted() const { return time_passed > 0; } bool onTransport; std::string ToString() const;