cleaning up

(cherry picked from commit fd9e635)

Author: LPLafontaineB

Assets/Scripts/Gameplay/ConnectionManagement/ConnectionManager.cs

@@ -150,7 +150,7 @@ void ReceiveServerToClientSetDisconnectReason_CustomMessage(ulong clientID, Fast
         }
 
         /// <summary>
-        /// Sends a DisconnectReason to all connected clients. This should only be done on the server, prior to disconnecting the client.
+        /// Sends a DisconnectReason to all connected clients. This should only be done on the server, prior to disconnecting the clients.
         /// </summary>
         /// <param name="status"> The reason for the upcoming disconnect.</param>
         public static void SendServerToAllClientsSetDisconnectReason(ConnectStatus status)

Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/ConnectedConnectionState.cs

@@ -27,28 +27,21 @@ public override void Exit() { }
 
         public override void OnClientDisconnect(ulong clientId)
         {
-            // This is also called on the Host when a different client disconnects. To make sure we only handle our own disconnection, verify that we are either
-            // not a host (in which case we know this is about us) or that the clientID is the same as ours if we are the host.
-            if (!NetworkManager.Singleton.IsHost || NetworkManager.Singleton.IsHost && NetworkManager.Singleton.LocalClientId == clientId)
+            switch (m_ConnectionManager.DisconnectReason.Reason)
             {
-                //On a client disconnect we want to take them back to the main menu.
-                //We have to check here in SceneManager if our active scene is the main menu, as if it is, it means we timed out rather than a raw disconnect;
-                switch (m_ConnectionManager.DisconnectReason.Reason)
-                {
-                    case ConnectStatus.UserRequestedDisconnect:
-                    case ConnectStatus.HostEndedSession:
-                        m_QuitGameSessionPublisher.Publish(new QuitGameSessionMessage() {UserRequested = false}); // go through the normal leave flow
-                        m_ConnectionManager.ChangeState(ConnectionStateType.Offline);
-                        break;
-                    default:
-                        // try reconnecting
-                        m_ConnectionManager.ChangeState(ConnectionStateType.Reconnecting);
-                        break;
-                }
-
-                m_ConnectStatusPublisher.Publish(m_ConnectionManager.DisconnectReason.Reason);
-                m_ConnectionManager.DisconnectReason.Clear();
+                case ConnectStatus.UserRequestedDisconnect:
+                case ConnectStatus.HostEndedSession:
+                    m_QuitGameSessionPublisher.Publish(new QuitGameSessionMessage() {UserRequested = false}); // go through the normal leave flow
+                    m_ConnectionManager.ChangeState(ConnectionStateType.Offline);
+                    break;
+                default:
+                    // try reconnecting
+                    m_ConnectionManager.ChangeState(ConnectionStateType.Reconnecting);
+                    break;
             }
+
+            m_ConnectStatusPublisher.Publish(m_ConnectionManager.DisconnectReason.Reason);
+            m_ConnectionManager.DisconnectReason.Clear();
         }
 
         public override void OnUserRequestedShutdown()

Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/HostingConnectionState.cs

@@ -5,7 +5,6 @@
 using Unity.Multiplayer.Samples.Utilities;
 using Unity.Netcode;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 namespace Unity.Multiplayer.Samples.BossRoom
 {
@@ -30,7 +29,7 @@ void InjectDependencies(LobbyServiceFacade lobbyServiceFacade,
 
         public override void Enter()
         {
-            var gameState = Object.Instantiate(m_ConnectionManager.GameState);
+            var gameState = UnityEngine.Object.Instantiate(m_ConnectionManager.GameState);
 
             gameState.Spawn();
 
@@ -41,7 +40,14 @@ public override void Enter()
             SceneLoaderWrapper.Instance.LoadScene("CharSelect", useNetworkSceneManager: true);
         }
 
-        public override void Exit() { }
+        public override void Exit()
+        {
+            if (m_LobbyServiceFacade.CurrentUnityLobby != null)
+            {
+                m_LobbyServiceFacade.DeleteLobbyAsync(m_LobbyServiceFacade.CurrentUnityLobby.Id);
+            }
+            SessionManager<SessionPlayerData>.Instance.OnServerEnded();
+        }
 
         public override void OnClientConnected(ulong clientId)
         {
@@ -52,11 +58,7 @@ public override void OnClientDisconnect(ulong clientId)
         {
             if (clientId == m_ConnectionManager.NetworkManager.LocalClientId)
             {
-                if (m_LobbyServiceFacade.CurrentUnityLobby != null)
-                {
-                    m_LobbyServiceFacade.DeleteLobbyAsync(m_LobbyServiceFacade.CurrentUnityLobby.Id);
-                }
-                SessionManager<SessionPlayerData>.Instance.OnServerEnded();
+                m_ConnectionManager.ChangeState(ConnectionStateType.Offline);
             }
             else
             {