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

Fix falling damage when not flying

Browse Source
This commit is contained in:
PilzAdam 2012-12-17 18:04:41 +01:00
parent e9006f904c
commit f4ed37ec6f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/localplayer.cpp
View File

@ -303,7 +303,7 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
*/ */
bool bouncy_jump = false; bool bouncy_jump = false;
// Dont report if flying // 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++){ for(size_t i=0; i<result.collisions.size(); i++){
const CollisionInfo &info = result.collisions[i]; const CollisionInfo &info = result.collisions[i];