Merge remote-tracking branch 'Eliminationzx/FixJumpDestOrientation' into 3.3.5 (PR #16450) with some minor CS adjustments
This commit is contained in:
commit
cfed2d7a3d
14 files changed
+39
-38
No files matched your search
@@ -16859,12 +16859,12 @@ void Unit::JumpTo(float speedXY, float speedZ, bool forward)
|
||||
}
|
||||
}
|
||||
|
||||
void Unit::JumpTo(WorldObject* obj, float speedZ)
|
||||
void Unit::JumpTo(WorldObject* obj, float speedZ, bool withOrientation)
|
||||
{
|
||||
float x, y, z;
|
||||
obj->GetContactPoint(this, x, y, z);
|
||||
float speedXY = GetExactDist2d(x, y) * 10.0f / speedZ;
|
||||
GetMotionMaster()->MoveJump(x, y, z, speedXY, speedZ);
|
||||
GetMotionMaster()->MoveJump(x, y, z, GetAngle(obj), speedXY, speedZ, EVENT_JUMP, withOrientation);
|
||||
}
|
||||
|
||||
bool Unit::HandleSpellClick(Unit* clicker, int8 seatId)
|
||||
|
||||
Reference in new issue
Block a user