From 58823381920e0e081b432db680dd3643029d6527 Mon Sep 17 00:00:00 2001
From: JugadorXEI <eugeniom9@gmail.com>
Date: Thu, 6 May 2021 03:10:01 +0200
Subject: [PATCH] Fix rare sink crash, fix jawz particles hang, fix magnet
 landing

---
 src/info.c   | 4 ++--
 src/k_kart.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/info.c b/src/info.c
index d639b617..41a4ef2a 100644
--- a/src/info.c
+++ b/src/info.c
@@ -15757,7 +15757,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		0,              // mass
 		0,              // damage
 		sfx_None,       // activesound
-		MF_NOBLOCKMAP|MF_BOUNCE|MF_SCENERY|MF_DONTENCOREMAP, // flags
+		MF_NOBLOCKMAP|MF_NOCLIP|MF_BOUNCE|MF_SCENERY|MF_DONTENCOREMAP, // flags
 		S_NULL          // raisestate
 	},
 
@@ -15904,7 +15904,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		sfx_tossed,     // seesound
 		8,              // reactiontime
 		sfx_None,       // attacksound
-		256*FRACUNIT,   // painstate
+		S_NULL,   		// painstate
 		100,            // painchance
 		sfx_None,       // painsound
 		S_NULL,         // meleestate
diff --git a/src/k_kart.c b/src/k_kart.c
index c4bade95..4b1bc458 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -4526,7 +4526,7 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd)
 		volume = FixedDiv(volume * FRACUNIT, volumedampen) / FRACUNIT;
 	}
 
-	if (volume <= 0) 
+	if (volume <= 0)
 	{
 		// Don't need to play the sound at all.
 		return;
@@ -5968,7 +5968,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 		{
 			if (player->kartstuff[k_offroad])
 				player->mo->friction -= 4912;
-			if (player->kartstuff[k_wipeoutslow] == 1)
+			if (player->kartstuff[k_wipeoutslow] == 1 && player->kartstuff[k_pogospring] == 0)
 				player->mo->friction -= 9824;
 		}
 	}