diff options
author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-12-29 16:24:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-29 16:24:53 +0100 |
commit | e698c17a2688385e62744cdf5eb37b12b9e304fa (patch) | |
tree | 82213601af173370c1eac92b3b457a89a69ba7e7 | |
parent | b60786a91610d2c841b4d61c360a2cdd97a49118 (diff) |
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
-rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 3 | ||||
-rw-r--r-- | src/server/game/Movement/Spline/MoveSpline.h | 4 |
2 files changed, 6 insertions, 1 deletions
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 |