diff options
| author | HybridDog <ovvv@web.de> | 2016-01-04 17:21:33 +0100 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2016-03-14 08:44:28 +0000 |
| commit | c0b6986e3875e6f42682c78fd5db0080a7bae651 (patch) | |
| tree | bc03d65ada090bb6538e55912be1398a2918b3d8 /src/localplayer.cpp | |
| parent | 5a40a7dad8cbf46320c3b5dd1122808eb4919b62 (diff) | |
| download | minetest-c0b6986e3875e6f42682c78fd5db0080a7bae651.tar.gz minetest-c0b6986e3875e6f42682c78fd5db0080a7bae651.tar.bz2 minetest-c0b6986e3875e6f42682c78fd5db0080a7bae651.zip | |
Fix player teleportation bug whilst sneaking
Only set back position when sneaking if player wasn't teleported by adding and using a bool "got_teleported" to player
it fixes #2876
Diffstat (limited to 'src/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 0c94582aa..dbd8c4a61 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -183,7 +183,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d, */ if (control.sneak && m_sneak_node_exists && !(fly_allowed && g_settings->getBool("free_move")) && !in_liquid && - physics_override_sneak) { + physics_override_sneak && !got_teleported) { f32 maxd = 0.5 * BS + sneak_max; v3f lwn_f = intToFloat(m_sneak_node, BS); position.X = rangelim(position.X, lwn_f.X-maxd, lwn_f.X+maxd); @@ -204,6 +204,9 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d, } } + if (got_teleported) + got_teleported = false; + // this shouldn't be hardcoded but transmitted from server float player_stepheight = touching_ground ? (BS*0.6) : (BS*0.2); |