removing workarounds

Author: LPLafontaineB

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

@@ -196,10 +196,7 @@ private IEnumerator TryToReconnect(string lobbyCode)
             int nbTries = 0;
             while (nbTries < k_NbReconnectAttempts)
             {
-                if (NetworkManager.Singleton.IsListening)
-                {
-                    NetworkManager.Singleton.Shutdown();
-                }
+                NetworkManager.Singleton.Shutdown();
 
                 yield return new WaitWhile(() => NetworkManager.Singleton.ShutdownInProgress); // wait until NetworkManager completes shutting down
                 Debug.Log($"Reconnecting attempt {nbTries + 1}/{k_NbReconnectAttempts}...");

Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/ServerAdditiveSceneLoader.cs

@@ -33,7 +33,7 @@ public class ServerAdditiveSceneLoader : NetworkBehaviour
         /// </summary>
         List<ulong> m_PlayersInTrigger;
 
-        bool m_IsActive;
+        bool IsActive => IsServer && IsSpawned;
 
         enum SceneState
         {
@@ -58,13 +58,11 @@ public override void OnNetworkSpawn()
 
                 NetworkManager.SceneManager.OnSceneEvent += OnSceneEvent;
                 m_PlayersInTrigger = new List<ulong>();
-                m_IsActive = true;
             }
         }
 
         public override void OnNetworkDespawn()
         {
-            m_IsActive = false;
             if (IsServer)
             {
                 NetworkManager.OnClientDisconnectCallback -= RemovePlayer;
@@ -86,7 +84,7 @@ void OnSceneEvent(SceneEvent sceneEvent)
 
         void OnTriggerEnter(Collider other)
         {
-            if (m_IsActive) // make sure that OnNetworkSpawn has been called before this
+            if (IsActive) // make sure that OnNetworkSpawn has been called before this
             {
                 if (other.CompareTag(m_PlayerTag) && other.TryGetComponent(out NetworkObject networkObject))
                 {
@@ -107,7 +105,7 @@ void OnTriggerEnter(Collider other)
 
         void OnTriggerExit(Collider other)
         {
-            if (m_IsActive) // make sure that OnNetworkSpawn has been called before this
+            if (IsActive) // make sure that OnNetworkSpawn has been called before this
             {
                 if (other.CompareTag(m_PlayerTag) && other.TryGetComponent(out NetworkObject networkObject))
                 {
@@ -118,7 +116,7 @@ void OnTriggerExit(Collider other)
 
         void FixedUpdate()
         {
-            if (m_IsActive) // make sure that OnNetworkSpawn has been called before this
+            if (IsActive) // make sure that OnNetworkSpawn has been called before this
             {
                 if (m_SceneState == SceneState.Unloaded && m_PlayersInTrigger.Count > 0)
                 {