From e698c17a2688385e62744cdf5eb37b12b9e304fa Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Sun, 29 Dec 2019 16:24:53 +0100 Subject: Core/Movement: Fix wrong orientation set when pausing movement (#23986) * Core/Movement: Fix wrong orientation set when pausing movement * Update MoveSpline.h * Update Unit.cpp --- src/server/game/Entities/Unit/Unit.cpp | 3 ++- src/server/game/Movement/Spline/MoveSpline.h | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index e0d4e43b966..aac027daab7 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10173,7 +10173,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 e73b8a53265..fb1309fca37 100644 --- a/src/server/game/Movement/Spline/MoveSpline.h +++ b/src/server/game/Movement/Spline/MoveSpline.h @@ -124,6 +124,10 @@ namespace Movement bool onTransport; std::string ToString() const; + bool HasStarted() const + { + return time_passed > 0; + } }; } #endif // TRINITYSERVER_MOVEPLINE_H -- cgit v1.2.3