From bc950c18a281650481497c2054bad811504e3cd8 Mon Sep 17 00:00:00 2001
From: AJ Martinez <aj@worldsbe.st>
Date: Thu, 19 Oct 2023 15:37:35 -0700
Subject: [PATCH] Persist player.lastsafelap after death

---
 src/g_game.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/g_game.c b/src/g_game.c
index 72a580b47..b0de381c8 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2066,6 +2066,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 	INT32 kickstartaccel;
 	INT32 checkpointId;
 	boolean enteredGame;
+	UINT8 lastsafelap;
 
 	roundconditions_t roundconditions;
 	boolean saveroundconditions;
@@ -2134,6 +2135,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 
 	pflags = (players[player].pflags & (PF_WANTSTOJOIN|PF_KICKSTARTACCEL|PF_SHRINKME|PF_SHRINKACTIVE|PF_AUTOROULETTE));
 
+	lastsafelap = players[player].lastsafelap;
+
 	// SRB2kart
 	memcpy(&itemRoulette, &players[player].itemRoulette, sizeof (itemRoulette));
 	memcpy(&respawn, &players[player].respawn, sizeof (respawn));
@@ -2287,6 +2290,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
 	p->spectator = spectator;
 	p->steering = steering;
 	p->angleturn = playerangleturn;
+	p->lastsafelap = lastsafelap;
 
 	// save player config truth reborn
 	p->skincolor = skincolor;