aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGiacomo Pozzoni <giacomopoz@gmail.com>2019-12-29 16:24:53 +0100
committerShauren <shauren.trinity@gmail.com>2021-12-19 15:48:43 +0100
commit292df30394dc9e15bbdcc6303b35f97bf6a07ae9 (patch)
tree2907d2cd9f8ddc8ed941e80d287980fa9c4175ee /src
parent2b27278516510bbe055f67bca9409fcf7bac40c7 (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 (cherry picked from commit e698c17a2688385e62744cdf5eb37b12b9e304fa)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp3
-rw-r--r--src/server/game/Movement/Spline/MoveSpline.h4
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 33ddfbd92e5..1a63e7a604c 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -9784,7 +9784,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 c9d4745e036..20265e23312 100644
--- a/src/server/game/Movement/Spline/MoveSpline.h
+++ b/src/server/game/Movement/Spline/MoveSpline.h
@@ -140,6 +140,10 @@ namespace Movement
bool onTransport;
bool splineIsFacingOnly;
std::string ToString() const;
+ bool HasStarted() const
+ {
+ return time_passed > 0;
+ }
};
}
#endif // TRINITYSERVER_MOVEPLINE_H