From 908e76247922d4adf879b3996c4f75bdbb4e536d Mon Sep 17 00:00:00 2001
From: TheTermos <55103816+TheTermos@users.noreply.github.com>
Date: Mon, 27 Jan 2020 19:30:11 +0100
Subject: [PATCH] Collision temporary fix for issue #6886

---
 src/collision.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/collision.cpp b/src/collision.cpp
index a443be7ab..cb81c15fe 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -415,12 +415,11 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 		Collision uncertainty radius
 		Make it a bit larger than the maximum distance of movement
 	*/
-	f32 d = pos_max_d * 1.1f;
-	// A fairly large value in here makes moving smoother
-	//f32 d = 0.15*BS;
+	//f32 d = pos_max_d * 1.1f;
 
-	// This should always apply, otherwise there are glitches
-	assert(d > pos_max_d);	// invariant
+	f32 d = 0.01f;	// Temporary fix, any nonzero d causes collision glitches, the more the greater it is.
+	// ultimately it has to be determined if any uncertainty is involved, and if it is, eliminated
+	// and d & pos_max_d params removed from function calls.
 
 	int loopcount = 0;
 
-- 
2.25.1