aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShadowNinja <noreply@gmail.com>2013-02-03 22:22:42 -0500
committerPilzAdam <PilzAdam@gmx.de>2013-02-10 12:35:04 +0100
commit1cda39d5bb1da90116ec9fb3da913634312b62fa (patch)
tree130ae2a809d856004ea1bc906606671953275e0f /src
parent32552fede5b941332819be6e8768b6945d0dd86b (diff)
downloadminetest-1cda39d5bb1da90116ec9fb3da913634312b62fa.tar.gz
minetest-1cda39d5bb1da90116ec9fb3da913634312b62fa.tar.bz2
minetest-1cda39d5bb1da90116ec9fb3da913634312b62fa.zip
Don't fall off nodes if sneaking with free_move on but without fly privileges
Diffstat (limited to 'src')
-rw-r--r--src/localplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index b6dd0f42e..2d0d77140 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -159,7 +159,7 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
If sneaking, keep in range from the last walked node and don't
fall off from it
*/
- if(control.sneak && m_sneak_node_exists && !g_settings->getBool("free_move"))
+ if(control.sneak && m_sneak_node_exists && !(fly_allowed && g_settings->getBool("free_move")))
{
f32 maxd = 0.5*BS + sneak_max;
v3f lwn_f = intToFloat(m_sneak_node, BS);