moved requested netmanger shutdown to server/client gamenetportals

Author: LPLafontaineB

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ClientGameNetPortal.cs

@@ -111,6 +111,12 @@ public void OnUserDisconnectRequest()
                     m_ConnectStatusPub.Publish(DisconnectReason.Reason);
                     DisconnectReason.Clear();
                 }
+
+                // only do it here if we are not the host. The host will do it in ServerGameNetPortal
+                if (!m_Portal.NetManager.IsHost)
+                {
+                    m_Portal.NetManager.Shutdown();
+                }
             }
         }
 

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/GameNetPortal.cs

@@ -247,27 +247,6 @@ public void RequestDisconnect()
             }
             m_ClientPortal.OnUserDisconnectRequest();
             m_ServerPortal.OnUserDisconnectRequest();
-
-            if (NetManager.IsServer)
-            {
-                StartCoroutine(WaitToShutdown());
-            }
-            else
-            {
-                ShutDown();
-            }
-        }
-
-        void ShutDown()
-        {
-            SessionManager<SessionPlayerData>.Instance.OnUserDisconnectRequest();
-            NetManager.Shutdown();
-        }
-
-        IEnumerator WaitToShutdown()
-        {
-            yield return new WaitForSeconds(0.5f);
-            ShutDown();
         }
     }
 }

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ServerGameNetPortal.cs

@@ -109,9 +109,18 @@ public void OnUserDisconnectRequest()
             if (m_Portal.NetManager.IsServer)
             {
                 SendServerToAllClientsSetDisconnectReason(ConnectStatus.HostDisconnected);
+                // wait before shutting down to make sure those messages get sent before the clients disconnect.
+                StartCoroutine(WaitToShutdown());
             }
         }
 
+        IEnumerator WaitToShutdown()
+        {
+            yield return new WaitForSeconds(0.5f);
+            SessionManager<SessionPlayerData>.Instance.OnUserDisconnectRequest();
+            m_Portal.NetManager.Shutdown();
+        }
+
         private void Clear()
         {
             //resets all our runtime state.