From 59ca91a825d4ca74c0863523a538399640503020 Mon Sep 17 00:00:00 2001
From: wolfy852 <wolfy852@hotmail.com>
Date: Fri, 17 May 2019 08:06:18 -0500
Subject: [PATCH] Fix the permanent instashield bug

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

diff --git a/src/k_kart.c b/src/k_kart.c
index 526564a6f..43c6c7cc8 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -4574,7 +4574,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 	{
 		player->powers[pw_flashing] = K_GetKartFlashing(player);
 	}
-	else if (player->powers[pw_flashing] == K_GetKartFlashing(player))
+	else if (player->powers[pw_flashing] >= K_GetKartFlashing(player))
 	{
 		player->powers[pw_flashing]--;
 	}
diff --git a/src/p_user.c b/src/p_user.c
index 61d8f36f3..a9ea84432 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8495,8 +8495,8 @@ void P_PlayerThink(player_t *player)
 	if (player->powers[pw_invulnerability] && player->powers[pw_invulnerability] < UINT16_MAX)
 		player->powers[pw_invulnerability]--;
 
-	if (player->powers[pw_flashing] && player->powers[pw_flashing] < UINT16_MAX && ((player->pflags & PF_NIGHTSMODE)
-		|| (player->spectator || player->powers[pw_flashing] < K_GetKartFlashing(player))))
+	if (player->powers[pw_flashing] && player->powers[pw_flashing] < UINT16_MAX && 
+		(player->spectator || player->powers[pw_flashing] < K_GetKartFlashing(player)))
 		player->powers[pw_flashing]--;
 
 	if (player->powers[pw_tailsfly] && player->powers[pw_tailsfly] < UINT16_MAX /*&& player->charability != CA_SWIM*/ && !(player->powers[pw_super] && ALL7EMERALDS(player->powers[pw_emeralds]))) // tails fly counter
-- 
GitLab