From 5e18db79e9061291157216613179b0f1d5b0f4fe Mon Sep 17 00:00:00 2001
From: RedEnchilada <redenchilada@derpymail.com>
Date: Mon, 25 May 2015 12:16:19 -0500
Subject: [PATCH] Fix mobjs sometimes clipping through floors (whoops!)

---
 src/p_mobj.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index edf30d58a..e44279347 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2272,6 +2272,11 @@ static boolean P_ZMovement(mobj_t *mo)
 		mom.y = mo->momy;
 		mom.z = mo->momz;
 
+		if (mo->eflags & MFE_VERTICALFLIP)
+			mo->z = mo->ceilingz - mo->height;
+		else
+			mo->z = mo->floorz;
+
 #ifdef ESLOPE
 		P_TryMove(mo, mo->x, mo->y, true); // Sets mo->standingslope correctly
 		if (mo->standingslope) {
@@ -2282,11 +2287,6 @@ static boolean P_ZMovement(mobj_t *mo)
 		}
 #endif
 
-		if (mo->eflags & MFE_VERTICALFLIP)
-			mo->z = mo->ceilingz - mo->height;
-		else
-			mo->z = mo->floorz;
-
 		// hit the floor
 		if (mo->type == MT_FIREBALL) // special case for the fireball
 			mom.z = P_MobjFlip(mo)*FixedMul(5*FRACUNIT, mo->scale);