From 729536b1363c83d43f04b283db7e2c966a13ae9f Mon Sep 17 00:00:00 2001
From: "Ben Russell (300178622)" <thematrixeatsyou@gmail.com>
Date: Mon, 9 Mar 2015 10:39:23 +1300
Subject: [PATCH] fix zipping bug

---
 pkg/base/obj_player.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/base/obj_player.lua b/pkg/base/obj_player.lua
index b0bea89..0aeb8b4 100644
--- a/pkg/base/obj_player.lua
+++ b/pkg/base/obj_player.lua
@@ -990,7 +990,7 @@ function new_player(settings)
 		-- fix sinking when no autoclimb
 		if this.alive then
 			local _,h2 = trace_gap(tx1,ty1,tz1)
-			if ty1+by2+0.05 > h2 then
+			if ty1+by2+0.05 > h2 and ty1+by2+0.05 < h2+0.8 then
 				ty1 = h2-by2-0.05
 			end
 		end