replacing null-conditional operators for types "T?"

Author: LPLafontaineB

Assets/Scripts/ConnectionManagement/ConnectionState/HostingState.cs

@@ -42,7 +42,19 @@ public override void Exit()
 
         public override void OnClientConnected(ulong clientId)
         {
-            m_ConnectionEventPublisher.Publish(new ConnectionEventMessage() { ConnectStatus = ConnectStatus.Success, PlayerName = SessionManager<SessionPlayerData>.Instance.GetPlayerData(clientId)?.PlayerName });
+            var playerData = SessionManager<SessionPlayerData>.Instance.GetPlayerData(clientId);
+            if (playerData != null)
+            {
+                m_ConnectionEventPublisher.Publish(new ConnectionEventMessage() { ConnectStatus = ConnectStatus.Success, PlayerName = playerData.Value.PlayerName });
+            }
+            else
+            {
+                // This should not happen since player data is assigned during connection approval
+                Debug.LogError($"No player data associated with client {clientId}");
+                var reason = JsonUtility.ToJson(ConnectStatus.GenericDisconnect);
+                m_ConnectionManager.NetworkManager.DisconnectClient(clientId, reason);
+            }
+
         }
 
         public override void OnClientDisconnect(ulong clientId)

Packages/com.unity.multiplayer.samples.coop/Utilities/Net/SessionManager.cs

@@ -67,7 +67,8 @@ public void DisconnectClient(ulong clientId)
                 // Mark client as disconnected, but keep their data so they can reconnect.
                 if (m_ClientIDToPlayerId.TryGetValue(clientId, out var playerId))
                 {
-                    if (GetPlayerData(playerId)?.ClientID == clientId)
+                    var playerData = GetPlayerData(playerId);
+                    if (playerData != null && playerData.Value.ClientID == clientId)
                     {
                         var clientData = m_ClientData[playerId];
                         clientData.IsConnected = false;
@@ -81,7 +82,8 @@ public void DisconnectClient(ulong clientId)
                 if (m_ClientIDToPlayerId.TryGetValue(clientId, out var playerId))
                 {
                     m_ClientIDToPlayerId.Remove(clientId);
-                    if (GetPlayerData(playerId)?.ClientID == clientId)
+                    var playerData = GetPlayerData(playerId);
+                    if (playerData != null && playerData.Value.ClientID == clientId)
                     {
                         m_ClientData.Remove(playerId);
                     }
@@ -262,7 +264,8 @@ void ClearDisconnectedPlayersData()
             foreach (var id in idsToClear)
             {
                 string playerId = m_ClientIDToPlayerId[id];
-                if (GetPlayerData(playerId)?.ClientID == id)
+                var playerData = GetPlayerData(playerId);
+                if (playerData != null && playerData.Value.ClientID == id)
                 {
                     m_ClientData.Remove(playerId);
                 }