From a3cd1310171ac68472b23a636c669902445eabfc Mon Sep 17 00:00:00 2001
From: Sally Cochenour <tehrealsalt@gmail.com>
Date: Wed, 30 Jan 2019 15:02:24 -0500
Subject: [PATCH] Don't bump while flashing

---
 src/k_kart.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/k_kart.c b/src/k_kart.c
index a9e1f9be..d09e3b60 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1068,6 +1068,21 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
 		|| (mobj2->player && mobj2->player->kartstuff[k_respawn]))
 		return;
 
+	// Don't bump if you're flashing
+	if (mobj1->player && mobj1->player->powers[pw_flashing] > 0
+		&& mobj1->player->powers[pw_flashing] < K_GetKartFlashing(mobj1->player)-1)
+	{
+		mobj1->player->powers[pw_flashing]++;
+		return;
+	}
+
+	if (mobj2->player && mobj2->player->powers[pw_flashing] > 0
+		&& mobj2->player->powers[pw_flashing] < K_GetKartFlashing(mobj2->player)-1)
+	{
+		mobj2->player->powers[pw_flashing]++;
+		return;
+	}
+
 	// Don't bump if you've recently bumped
 	if (mobj1->player && mobj1->player->kartstuff[k_justbumped])
 	{