diff options
author | Treeston <treeston.mmoc@gmail.com> | 2018-04-01 18:27:29 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-09-23 22:28:06 +0200 |
commit | f69d12504ca3089439fa6d33b7c6e73e1585779f (patch) | |
tree | cfea63f880a890a37e60c132410f8940ff3a5b82 /src/server/game/Movement/MotionMaster.cpp | |
parent | b0e064ff8902457dea80ebe01fd84786105d7d09 (diff) |
Core/Object: Bump hover delta handling on nearpoints downstack into GetNearPoint2D (from movement generators); functionality should be unchanged
(cherry picked from commit ebc96af6bb784819ba8824ac390864ae9ba12351)
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 a4f9e955644..d1cc83b35b0 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -432,7 +432,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); @@ -456,7 +456,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); |