aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Movement
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Movement')
-rw-r--r--src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp3
-rw-r--r--src/server/game/Movement/Spline/MoveSplineInit.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 232ad771b16..f28f37134a4 100644
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -486,8 +486,7 @@ void WaypointMovementGenerator<Creature>::StartMove(Creature* owner, bool relaun
{
o -= trans->GetTransportOrientation();
owner->SetTransportHomePosition(x, y, z, o);
- trans->CalculatePassengerPosition(x, y, z, &o);
- owner->SetHomePosition(x, y, z, o);
+ owner->SetHomePosition(trans->GetPositionWithOffset(owner->GetTransportHomePosition()));
}
// else if (vehicle) - this should never happen, vehicle offsets are const
}
diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp
index 9eb54f0ce73..0f8ac3c2cc4 100644
--- a/src/server/game/Movement/Spline/MoveSplineInit.cpp
+++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp
@@ -35,7 +35,7 @@ namespace Movement
Vector3 operator()(Vector3 input) const
{
if (_transport)
- _transport->CalculatePassengerOffset(input.x, input.y, input.z);
+ _transport->GetPositionOffsetTo({ input.x, input.y, input.z }).GetPosition(input.x, input.y, input.z);
return input;
}