Fix UI error when leaving the lobby too quickly (#887)

Adds a validity check for UIPlayer identity before fetching persistent spawn loadout index
R2Northstar · Nov 18, 2024 · 316ec34 · 316ec34
1 parent 22a9dc5
commit 316ec34
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/sh_progression.nut b/Northstar.CustomServers/mod/scripts/vscripts/sh_progression.nut
@@ -169,8 +169,13 @@ void function UpdateCachedLoadouts_Threaded()
 	// below here is just making all the menu models update properly and such
 
 	#if UI
-	uiGlobal.pilotSpawnLoadoutIndex = GetPersistentSpawnLoadoutIndex( GetUIPlayer(), "pilot" )
-	uiGlobal.titanSpawnLoadoutIndex = GetPersistentSpawnLoadoutIndex( GetUIPlayer(), "titan" )
+	entity UIPlayer = GetUIPlayer()
+
+	if ( !IsValid( UIPlayer ) )
+		return
+
+	uiGlobal.pilotSpawnLoadoutIndex = GetPersistentSpawnLoadoutIndex( UIPlayer, "pilot" )
+	uiGlobal.titanSpawnLoadoutIndex = GetPersistentSpawnLoadoutIndex( UIPlayer, "titan" )
 	#endif
 
 	#if CLIENT