diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2018-04-01 18:27:29 +0200 | 
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2018-04-01 18:27:29 +0200 | 
| commit | ebc96af6bb784819ba8824ac390864ae9ba12351 (patch) | |
| tree | a312819a680ad33ee84c7c5732e46a3af53649d2 /src/server/game/Movement/MotionMaster.cpp | |
| parent | 69143b949e89612bbdd3abbc5308175a19ff76f9 (diff) | |
Core/Object: Bump hover delta handling on nearpoints downstack into GetNearPoint2D (from movement generators); functionality should be unchanged
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 92ac7b11fc1..cb00f455959 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -436,7 +436,7 @@ void MotionMaster::MoveKnockbackFrom(float srcX, float srcY, float speedXY, floa      float dist = 2 * moveTimeHalf * speedXY;      float max_height = -Movement::computeFallElevation(moveTimeHalf, false, -speedZ); -    _owner->GetNearPoint(_owner, x, y, z, _owner->GetCombatReach(), dist, _owner->GetAbsoluteAngle(srcX, srcY) + float(M_PI)); +    _owner->GetNearPoint(_owner, x, y, z, dist, _owner->GetAbsoluteAngle(srcX, srcY) + float(M_PI));      Movement::MoveSplineInit init(_owner);      init.MoveTo(x, y, z); @@ -457,7 +457,7 @@ void MotionMaster::MoveJumpTo(float angle, float speedXY, float speedZ)      float moveTimeHalf = speedZ / Movement::gravity;      float dist = 2 * moveTimeHalf * speedXY; -    _owner->GetNearPoint2D(x, y, dist, _owner->GetOrientation() + angle); +    _owner->GetNearPoint2D(nullptr, x, y, dist, _owner->GetOrientation() + angle);      z = _owner->GetPositionZ();      _owner->UpdateAllowedPositionZ(x, y, z);      MoveJump(x, y, z, 0.0f, speedXY, speedZ); | 
