diff options
| author | PilzAdam <adam-k@outlook.com> | 2012-12-17 18:04:41 +0100 |
|---|---|---|
| committer | PilzAdam <adam-k@outlook.com> | 2012-12-17 18:04:41 +0100 |
| commit | f4ed37ec6f1d24c2da3dab14b3478d3b0452d7aa (patch) | |
| tree | a3ebab4383548133514a648f4c83a59db11a03bd | |
| parent | e9006f904c81ee0b9654d7046f0ceeec02b51478 (diff) | |
| download | minetest-f4ed37ec6f1d24c2da3dab14b3478d3b0452d7aa.tar.gz minetest-f4ed37ec6f1d24c2da3dab14b3478d3b0452d7aa.tar.bz2 minetest-f4ed37ec6f1d24c2da3dab14b3478d3b0452d7aa.zip | |
Fix falling damage when not flying
| -rw-r--r-- | src/localplayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 8189e46a5..2a83ba956 100644 --- 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]; |