src/p_mobj.c

@@ -2961,7 +2961,7 @@ static void P_PlayerZMovement(mobj_t *mo)
 		}
 #endif
 
-		if (P_MobjFlip(mo)*mo->momz < 0) // falling
+		if (P_MobjFlip(mo)*mo->momz <= 0) // falling
 		{
 			boolean clipmomz = !(P_CheckDeathPitCollide(mo));
 
@@ -3874,6 +3874,7 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
 static void P_PlayerMobjThinker(mobj_t *mobj)
 {
 	msecnode_t *node;
+	boolean wasonground;
 
 	I_Assert(mobj != NULL);
 	I_Assert(mobj->player != NULL);
@@ -3915,6 +3916,8 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
 		}
 	}
 
+	wasonground = P_IsObjectOnGround(mobj);
+
 	// Needed for gravity boots
 	P_CheckGravity(mobj, false);
 
@@ -4002,7 +4005,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
 
 	// always do the gravity bit now, that's simpler
 	// BUT CheckPosition only if wasn't done before.
-	if (!(mobj->eflags & MFE_ONGROUND) || mobj->momz
+	if (!(mobj->eflags & MFE_ONGROUND) || mobj->momz || (!wasonground && P_IsObjectOnGround(mobj))
 		|| ((mobj->eflags & MFE_VERTICALFLIP) && mobj->z + mobj->height != mobj->ceilingz)
 		|| (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z != mobj->floorz)
 		|| P_IsObjectInGoop(mobj))

src/p_user.c

@@ -5592,7 +5592,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
 				else
 					potentialmomz = ((player->speed < 10*player->mo->scale)
 					? (player->speed - 10*player->mo->scale)/5
-					: -1); // Should be 0, but made negative to ensure P_PlayerHitFloor runs upon touching ground
+					: 0);
 				if (P_MobjFlip(player->mo)*player->mo->momz < potentialmomz)
 					player->mo->momz = P_MobjFlip(player->mo)*potentialmomz;
 				player->pflags &= ~PF_SPINNING;