Fix falling damage when not flying

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 8189e46a58fb5cbf6567fbe6dfaf380d7be9be7f..2a83ba95635b7515f046f60275f4791c03d5d7be 100644 (file)
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -303,7 +303,7 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
        */
        bool bouncy_jump = false;
        // Dont report if flying
-       if(collision_info && !g_settings->getBool("free_move"))
+       if(collision_info && !(g_settings->getBool("free_move") && fly_allowed))
        {
                for(size_t i=0; i<result.collisions.size(); i++){
                        const CollisionInfo &info = result.collisions[i];