fixing issue when no one is left in char select and DGS comes back to waiting for players

Author: SamuelBellomo

Assets/Scripts/Gameplay/GameState/ServerCharSelectState.cs

@@ -149,6 +149,12 @@ int FindLobbyPlayerIdx(ulong clientId)
         /// </summary>
         void CloseLobbyIfReady()
         {
+            // If dedicated server, leave char select open if there's no one left
+            if (DedicatedServerUtilities.IsServerBuildTarget && CharSelectData.LobbyPlayers.Count == 0)
+            {
+                return;
+            }
+
             foreach (CharSelectData.LobbyPlayerState playerInfo in CharSelectData.LobbyPlayers)
             {
                 if (playerInfo.SeatState != CharSelectData.SeatState.LockedIn)
@@ -162,6 +168,11 @@ void CloseLobbyIfReady()
             SaveLobbyResults();
 
             // Delay a few seconds to give the UI time to react, then switch scenes
+            IEnumerator WaitToEndLobby()
+            {
+                yield return new WaitForSeconds(3);
+                SceneLoaderWrapper.Instance.LoadScene(SceneNames.BossRoom, useNetworkSceneManager: true);
+            }
             m_WaitToEndLobbyCoroutine = StartCoroutine(WaitToEndLobby());
         }
 
@@ -193,11 +204,7 @@ void SaveLobbyResults()
             }
         }
 
-        IEnumerator WaitToEndLobby()
-        {
-            yield return new WaitForSeconds(3);
-            SceneLoaderWrapper.Instance.LoadScene(SceneNames.BossRoom, useNetworkSceneManager: true);
-        }
+
 
         public void OnNetworkDespawn()
         {

Assets/Scripts/Gameplay/GameplayObjects/PersistentPlayer.cs

@@ -75,7 +75,7 @@ void RemovePersistentPlayer()
             if (IsServer)
             {
                 var sessionPlayerData = SessionManager<SessionPlayerData>.Instance.GetPlayerData(OwnerClientId);
-                if (sessionPlayerData.HasValue)
+                if (sessionPlayerData.HasValue) // it's possible no session has started yet (for ex when in character select)
                 {
                     var playerData = sessionPlayerData.Value;
                     playerData.PlayerName = m_NetworkNameState.Name.Value;