BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Refine movement anticheat again (#7004)

Browse Source 
* Account for walking speed in vertical dir
* Avoid undefined behaviour due to division-by-zero
This commit is contained in:
sfan5 2018-02-02 23:34:09 +01:00 committed by SmallJoker
parent 842eccee19
commit 9d3fa874be
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/content_sao.cpp
View File

@ -1414,6 +1414,12 @@ bool PlayerSAO::checkMovementCheat()
// until this can be verified correctly, tolerate higher jumping speeds
player_max_jump *= 2.0;
// Don't divide by zero!
if (player_max_walk < 0.0001f)
player_max_walk = 0.0001f;
if (player_max_jump < 0.0001f)
player_max_jump = 0.0001f;
v3f diff = (m_base_position - m_last_good_position);
float d_vert = diff.Y;
diff.Y = 0;
@ -1422,8 +1428,11 @@ bool PlayerSAO::checkMovementCheat()
// FIXME: Checking downwards movement is not easily possible currently,
// the server could calculate speed differences to examine the gravity
if (d_vert > 0)
required_time = MYMAX(required_time, d_vert / player_max_jump);
if (d_vert > 0) {
// In certain cases (water, ladders) walking speed is applied vertically
float s = MYMAX(player_max_jump, player_max_walk);
required_time = MYMAX(required_time, d_vert / s);
}
if (m_move_pool.grab(required_time)) {
m_last_good_position = m_base_position;