From 9103332e36e8581cb1ab36dce1aa05c3462a466e Mon Sep 17 00:00:00 2001
From: furo <furo@posteo.net>
Date: Fri, 6 Sep 2024 20:12:07 +0200
Subject: [PATCH] Fix crash with `hot_reload` while in `super`

---
 src/game/server/gamecontext.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index f88d12dc4..06542e66a 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -3208,12 +3208,16 @@ void CGameContext::ConHotReload(IConsole::IResult *pResult, void *pUserData)
 		if(!pSelf->GetPlayerChar(i))
 			continue;
 
+		CCharacter *pChar = pSelf->GetPlayerChar(i);
+
 		// Save the tee individually
 		pSelf->m_apSavedTees[i] = new CSaveTee();
-		pSelf->m_apSavedTees[i]->Save(pSelf->GetPlayerChar(i), false);
+		pSelf->m_apSavedTees[i]->Save(pChar, false);
 
 		// Save the team state
 		pSelf->m_aTeamMapping[i] = pSelf->GetDDRaceTeam(i);
+		if(pSelf->m_aTeamMapping[i] == TEAM_SUPER)
+			pSelf->m_aTeamMapping[i] = pChar->m_TeamBeforeSuper;
 
 		if(pSelf->m_apSavedTeams[pSelf->m_aTeamMapping[i]])
 			continue;