aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2014-01-28 22:40:13 +0100
committerjackpoz <giacomopoz@gmail.com>2014-01-30 20:03:13 +0100
commit378d27f9bcb04543ebc7a119279b3b88a05c588e (patch)
tree240b87fb85111708f9c0f5b2b8f3913b6c9943dc
parentad8eb434c02e451effd0949aaa7d2b7999d91597 (diff)
Core/Splines: Fix "velocity > 0.1f" error
Updates #6191.
-rw-r--r--src/server/game/Movement/MotionMaster.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index d224c21efe8..55f745d993b 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -337,6 +337,9 @@ void MotionMaster::MoveKnockbackFrom(float srcX, float srcY, float speedXY, floa
if (_owner->GetTypeId() == TYPEID_PLAYER)
return;
+ if (speedXY <= 0.1f)
+ return;
+
float x, y, z;
float moveTimeHalf = speedZ / Movement::gravity;
float dist = 2 * moveTimeHalf * speedXY;
@@ -370,6 +373,8 @@ void MotionMaster::MoveJumpTo(float angle, float speedXY, float speedZ)
void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float speedZ, uint32 id)
{
TC_LOG_DEBUG("misc", "Unit (GUID: %u) jump to point (X: %f Y: %f Z: %f)", _owner->GetGUIDLow(), x, y, z);
+ if (speedXY <= 0.1f)
+ return;
float moveTimeHalf = speedZ / Movement::gravity;
float max_height = -Movement::computeFallElevation(moveTimeHalf, false, -speedZ);