From 2ec203822fa43d6faa98115a19db4089b89f1666 Mon Sep 17 00:00:00 2001
From: Antonio Martinez <aj@worldsbe.st>
Date: Fri, 20 Jun 2025 15:19:34 -0400
Subject: [PATCH] Sakura protection (NEO damage rules)

---
 src/p_inter.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/p_inter.c b/src/p_inter.c
index 04a05ce4c..510fb6d4a 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -3181,6 +3181,12 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 						}
 					}
 
+					if (inflictor->momx == 0 && inflictor->momy == 0 && inflictor->momz == 0)
+					{
+						// Probably a map hazard.
+						allowcombo = false;
+					}
+
 					if (allowcombo == false && (target->eflags & MFE_PAUSED))
 					{
 						return false;
@@ -3395,18 +3401,22 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 				K_PopPlayerShield(player);
 			}
 
-			if (!(gametyperules & GTR_SPHERES) && player->tripwireLeniency)
+			boolean downgraded = false;
+
+			if (!(gametyperules & GTR_SPHERES) && player->tripwireLeniency && !P_PlayerInPain(player))
 			{
 				switch (type)
 				{
 					case DMG_EXPLODE:
 						type = DMG_TUMBLE;
+						downgraded = true;
 						break;
 					case DMG_TUMBLE:
 						softenTumble = true;
 						break;
 					case DMG_NORMAL:
 					case DMG_WIPEOUT:
+						downgraded = true;
 						type = DMG_STUMBLE;
 						player->ringburst += 5; // THERE IS SIMPLY NO HOPE AT THIS POINT
 						K_PopPlayerShield(player);
@@ -3453,7 +3463,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 				ringburst = 0;
 			}
 
-			if (type != DMG_STUMBLE && type != DMG_WHUMBLE)
+			if ((type != DMG_STUMBLE && type != DMG_WHUMBLE) || (type == DMG_STUMBLE && downgraded))
 			{
 				if (type != DMG_STING)
 					player->flashing = K_GetKartFlashing(player);