From 058ed632de5e63e5f9108aa2d682ea1c2958f508 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Sun, 6 Oct 2019 19:53:54 +0200
Subject: [PATCH] Fixed solid objects (such as Minus-carried TNT barrels) not
 colliding with players.

Springs and gas jets are exempt because all hell might break loose otherwise.
---
 src/p_map.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p_map.c b/src/p_map.c
index 161f5b14ab..59a2f9b514 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -1561,8 +1561,8 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		}
 	}
 
-	if ((!tmthing->player) && (thing->player))
-		; // no solid thing should ever be able to step up onto a player
+	if ((thing->flags & MF_SPRING || thing->type == MT_STEAM) && (thing->player))
+		; // springs and gas jets should never be able to step up onto a player
 	// z checking at last
 	// Treat noclip things as non-solid!
 	else if ((thing->flags & (MF_SOLID|MF_NOCLIP)) == MF_SOLID
-- 
GitLab