From: Nathanaël Courant <Ekdohibs@users.noreply.github.com>
Date: Tue, 5 Apr 2016 23:11:36 +0000 (+0200)
Subject: Fix #3955 (player dying on login).
X-Git-Tag: 0.4.14~116
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=15e1dcc020ca5c64e4b5b306529e513cb2b97bef;p=oweals%2Fminetest.git

Fix #3955 (player dying on login).

It was caused by player not moving because fall was prevented, but their
velocity still increasing, causing fatal fall damage when world was
finally loaded. This commit fixes it by setting player velocity to zero
when the world around them is not loaded.
---

diff --git a/src/collision.cpp b/src/collision.cpp
index 16db3310c..74c0c25c3 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -332,8 +332,10 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 
 	// Do not move if world has not loaded yet, since custom node boxes
 	// are not available for collision detection.
-	if (!any_position_valid)
+	if (!any_position_valid) {
+		*speed_f = v3f(0, 0, 0);
 		return result;
+	}
 
 	} // tt2