From d725963f42db4976ff201b74cfb99688af19e252 Mon Sep 17 00:00:00 2001
From: AJ Martinez <aj@worldsbe.st>
Date: Fri, 19 May 2023 18:56:14 -0700
Subject: [PATCH] Don't drain spheres while ebraking in guardbreak

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

diff --git a/src/k_kart.c b/src/k_kart.c
index f71700098..de98f8378 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -7817,7 +7817,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 				player->spheredigestion = spheredigestion;
 			}
 
-			if (K_PlayerEBrake(player) && (player->ebrakefor%6 == 0))
+			if (K_PlayerGuard(player) && (player->ebrakefor%6 == 0))
 				player->spheres--;
 		}
 		else
@@ -10588,7 +10588,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 						K_MatchGenericExtraFlags(whip, player->mo);
 						whip->fuse = 12; // Changing instawhip animation duration? Look here
 						player->flashing = max(player->flashing, 12);
-						player->mo->momz += FRACUNIT;
+						player->mo->momz += 4*mapobjectscale;
 					}
 				}