resolving null refs

making sure we don't call OnClientDisconnect multiple times in ServerBossRoomState
Cleaning up callbacks in ServerBossRoomState

Author: SamuelBellomo

Assets/Scripts/Gameplay/GameState/ClientMainMenuState.cs

@@ -106,7 +106,11 @@ private void OnSignInFailed()
 
         protected override void OnDestroy()
         {
-            m_ProfileManager.onProfileChanged -= OnProfileChanged;
+            if (m_ProfileManager != null)
+            {
+                m_ProfileManager.onProfileChanged -= OnProfileChanged;
+            }
+
             base.OnDestroy();
         }
 

Assets/Scripts/Gameplay/GameState/ServerBossRoomState.cs

@@ -72,51 +72,29 @@ void OnNetworkSpawn()
                 return;
             }
 
-            NetworkManager.Singleton.SceneManager.OnLoadComplete += OnServerLoadComplete;
-            NetworkManager.Singleton.SceneManager.OnUnloadComplete += OnServerUnloadComplete;
-        }
-
-        void OnNetworkDespawn()
-        {
-            NetworkManager.Singleton.SceneManager.OnLoadComplete -= OnServerLoadComplete;
-            NetworkManager.Singleton.SceneManager.OnUnloadComplete -= OnServerUnloadComplete;
-        }
-
-        void OnServerLoadComplete(ulong clientId, string sceneName, LoadSceneMode loadSceneMode)
-        {
-            if (clientId != NetworkManager.ServerClientId)
-            {
-                return;
-            }
-
             // reset win state
             SetWinState(WinState.Invalid);
 
-            NetworkManager.Singleton.OnClientDisconnectCallback += OnClientDisconnect;
-            NetworkManager.Singleton.SceneManager.OnLoadEventCompleted += OnLoadEventCompleted;
-            NetworkManager.Singleton.SceneManager.OnSynchronizeComplete += OnSynchronizeComplete;
+            NetworkManager.Singleton.OnClientDisconnectCallback += OnClientDisconnectCheckGameOver;
+            NetworkManager.Singleton.SceneManager.OnLoadEventCompleted += OnLoadEventCompletedSpawnAllPlayers;
+            NetworkManager.Singleton.SceneManager.OnSynchronizeComplete += OnSynchronizeCompleteForLateJoin;
 
             SessionManager<SessionPlayerData>.Instance.OnSessionStarted();
             m_Subscription = m_LifeStateChangedEventMessageSubscriber.Subscribe(OnLifeStateChangedEventMessage);
         }
 
-        void OnServerUnloadComplete(ulong clientId, string sceneName)
+        void OnNetworkDespawn()
         {
-            if (clientId != NetworkManager.ServerClientId)
-            {
-                return;
-            }
+            NetworkManager.Singleton.OnClientDisconnectCallback -= OnClientDisconnectCheckGameOver;
+            NetworkManager.Singleton.SceneManager.OnLoadEventCompleted -= OnLoadEventCompletedSpawnAllPlayers;
+            NetworkManager.Singleton.SceneManager.OnSynchronizeComplete -= OnSynchronizeCompleteForLateJoin;
 
-            NetworkManager.Singleton.OnClientDisconnectCallback -= OnClientDisconnect;
-            NetworkManager.Singleton.SceneManager.OnLoadEventCompleted -= OnLoadEventCompleted;
-            NetworkManager.Singleton.SceneManager.OnSynchronizeComplete -= OnSynchronizeComplete;
+            SessionManager<SessionPlayerData>.Instance.OnSessionEnded();
             m_Subscription?.Dispose();
         }
 
         protected override void OnDestroy()
         {
-            m_Subscription?.Dispose();
-
             if (m_NetcodeHooks)
             {
                 m_NetcodeHooks.OnNetworkSpawnHook -= OnNetworkSpawn;
@@ -126,7 +104,7 @@ protected override void OnDestroy()
             base.OnDestroy();
         }
 
-        void OnSynchronizeComplete(ulong clientId)
+        void OnSynchronizeCompleteForLateJoin(ulong clientId)
         {
             if (InitialSpawnDone && !PlayerServerCharacter.GetPlayerServerCharacter(clientId))
             {
@@ -138,7 +116,7 @@ void OnSynchronizeComplete(ulong clientId)
             }
         }
 
-        void OnLoadEventCompleted(string sceneName, LoadSceneMode loadSceneMode, List<ulong> clientsCompleted, List<ulong> clientsTimedOut)
+        void OnLoadEventCompletedSpawnAllPlayers(string sceneName, LoadSceneMode loadSceneMode, List<ulong> clientsCompleted, List<ulong> clientsTimedOut)
         {
             if (!InitialSpawnDone && loadSceneMode == LoadSceneMode.Single)
             {
@@ -150,8 +128,9 @@ void OnLoadEventCompleted(string sceneName, LoadSceneMode loadSceneMode, List<ul
             }
         }
 
-        void OnClientDisconnect(ulong clientId)
+        void OnClientDisconnectCheckGameOver(ulong clientId)
         {
+            //TODO exception in on client disconnect causes a bunch of bugs in NGO?
             if (clientId != NetworkManager.Singleton.LocalClientId)
             {
                 // If a client disconnects, check for game over in case all other players are already down

Assets/Scripts/Gameplay/GameState/ServerCharSelectState.cs

@@ -46,7 +46,11 @@ protected override void Awake()
         protected override void OnDestroy()
         {
             base.OnDestroy();
-            NetworkManager.Singleton.SceneManager.VerifySceneBeforeLoading -= DontSyncClientOnlyScenes;
+            if (NetworkManager.Singleton != null && NetworkManager.Singleton.SceneManager != null)
+            {
+                NetworkManager.Singleton.SceneManager.VerifySceneBeforeLoading -= DontSyncClientOnlyScenes;
+            }
+
             if (m_NetcodeHooks)
             {
                 m_NetcodeHooks.OnNetworkSpawnHook -= OnNetworkSpawn;

Assets/Scripts/Gameplay/GameState/ServerPostGameState.cs

@@ -31,8 +31,7 @@ void OnNetworkSpawn()
             }
             else
             {
-                SessionManager<SessionPlayerData>.Instance.OnSessionEnded();
-				
+
                 if (DedicatedServerUtilities.IsServerBuildTarget)
                 {
                     IEnumerator WaitAndStartNewGame()