simplifying initial spawn logic

* Removed use of clientSceneMap
* Replaced with OnLoadEventCompleted and OnSynchronizeComplete callbacks

Author: LPLafontaineB

Assets/BossRoom/Scripts/Gameplay/ConnectionManagement/ConnectionManager.cs

@@ -75,18 +75,6 @@ public class ConnectionManager : MonoBehaviour
         LocalLobby m_LocalLobby;
         IPublisher<ConnectionEventMessage> m_ConnectionEventPublisher;
 
-
-        /// <summary>
-        /// Keeps a list of what clients are in what scenes.
-        /// </summary>
-        Dictionary<ulong, int> m_ClientSceneMap = new Dictionary<ulong, int>();
-
-        /// <summary>
-        /// The active server scene index.
-        /// </summary>
-        static int ServerScene => SceneManager.GetActiveScene().buildIndex;
-
-
         [Inject]
         void InjectDependencies(ProfileManager profileManager, LobbyServiceFacade lobbyServiceFacade, LocalLobby localLobby, IPublisher<ConnectionEventMessage> connectionEventPublisher)
         {
@@ -127,21 +115,6 @@ void OnDestroy()
 
         }
 
-        public void OnClientSceneChanged(ulong clientId, int sceneIndex)
-        {
-            m_ClientSceneMap[clientId] = sceneIndex;
-        }
-
-        public bool AreAllClientsInServerScene()
-        {
-            foreach (var kvp in m_ClientSceneMap)
-            {
-                if (kvp.Value != ServerScene) { return false; }
-            }
-
-            return true;
-        }
-
         public void ChangeState(ConnectionStateType newState)
         {
             Debug.Log(newState);
@@ -160,16 +133,6 @@ void OnServerStarted()
             //The "BossRoom" server always advances to CharSelect immediately on start. Different games
             //may do this differently.
             SceneLoaderWrapper.Instance.LoadScene("CharSelect", useNetworkSceneManager: true);
-
-            NetworkManager.SceneManager.OnSceneEvent += SceneManagerOnOnSceneEvent;
-        }
-
-        void SceneManagerOnOnSceneEvent(SceneEvent sceneEvent)
-        {
-            // only processing single player finishing loading events
-            if (sceneEvent.SceneEventType != SceneEventType.LoadComplete) return;
-
-            OnClientSceneChanged(sceneEvent.ClientId, SceneManager.GetSceneByName(sceneEvent.SceneName).buildIndex);
         }
 
         void OnClientDisconnectCallback(ulong clientId)
@@ -225,7 +188,6 @@ public bool StartHostIp(string playerName, string ipaddress, int port)
         public void RequestShutdown()
         {
             m_Logics[m_CurrentState].OnUserRequestedShutdown();
-            m_ClientSceneMap.Clear();
         }
 
         public void OnServerShutdown()

Assets/BossRoom/Scripts/Gameplay/Server/State/ServerBossRoomState.cs

@@ -69,9 +69,8 @@ public override void OnNetworkSpawn()
                 SetWinState(WinState.Invalid);
 
                 NetworkManager.OnClientDisconnectCallback += OnClientDisconnect;
-                NetworkManager.SceneManager.OnSceneEvent += OnClientSceneChanged;
-
-                DoInitialSpawnIfPossible();
+                NetworkManager.SceneManager.OnLoadEventCompleted += OnLoadEventCompleted;
+                NetworkManager.SceneManager.OnSynchronizeComplete += OnSynchronizeComplete;
 
                 SessionManager<SessionPlayerData>.Instance.OnSessionStarted();
                 m_Subscription = m_LifeStateChangedEventMessageSubscriber.Subscribe(OnLifeStateChangedEventMessage);
@@ -83,18 +82,29 @@ public override void OnDestroy()
             m_Subscription?.Dispose();
         }
 
-        private bool DoInitialSpawnIfPossible()
+        void OnSynchronizeComplete(ulong clientId)
         {
-            if (m_ConnectionManager.AreAllClientsInServerScene() && !InitialSpawnDone)
+            if (InitialSpawnDone &&
+                !PlayerServerCharacter.GetPlayerServerCharacter(clientId))
+            {
+                //somebody joined after the initial spawn. This is a Late Join scenario. This player may have issues
+                //(either because multiple people are late-joining at once, or because some dynamic entities are
+                //getting spawned while joining. But that's not something we can fully address by changes in
+                //ServerBossRoomState.
+                SpawnPlayer(clientId, true);
+            }
+        }
+
+        void OnLoadEventCompleted(string sceneName, LoadSceneMode loadSceneMode, List<ulong> clientsCompleted, List<ulong> clientsTimedOut)
+        {
+            if (!InitialSpawnDone && loadSceneMode == LoadSceneMode.Single)
             {
                 InitialSpawnDone = true;
                 foreach (var kvp in NetworkManager.ConnectedClients)
                 {
                     SpawnPlayer(kvp.Key, false);
                 }
-                return true;
             }
-            return false;
         }
 
         void OnClientDisconnect(ulong clientId)
@@ -113,37 +123,11 @@ IEnumerator WaitToCheckForGameOver()
             CheckForGameOver();
         }
 
-        public void OnClientSceneChanged(SceneEvent sceneEvent)
-        {
-            if (sceneEvent.SceneEventType != SceneEventType.LoadComplete) return;
-
-            var clientId = sceneEvent.ClientId;
-            var sceneIndex = SceneManager.GetSceneByName(sceneEvent.SceneName).buildIndex;
-            int serverScene = UnityEngine.SceneManagement.SceneManager.GetActiveScene().buildIndex;
-            if (sceneIndex == serverScene)
-            {
-                Debug.Log($"client={clientId} now in scene {sceneIndex}, server_scene={serverScene}, all players in server scene={m_ConnectionManager.AreAllClientsInServerScene()}");
-
-                bool didSpawn = DoInitialSpawnIfPossible();
-
-                if (!didSpawn && InitialSpawnDone &&
-                    !PlayerServerCharacter.GetPlayerServerCharacters().Find(
-                        player => player.OwnerClientId == clientId))
-                {
-                    //somebody joined after the initial spawn. This is a Late Join scenario. This player may have issues
-                    //(either because multiple people are late-joining at once, or because some dynamic entities are
-                    //getting spawned while joining. But that's not something we can fully address by changes in
-                    //ServerBossRoomState.
-                    SpawnPlayer(clientId, true);
-                }
-
-            }
-        }
-
         public override void OnNetworkDespawn()
         {
             NetworkManager.OnClientDisconnectCallback -= OnClientDisconnect;
-            NetworkManager.SceneManager.OnSceneEvent -= OnClientSceneChanged;
+            NetworkManager.SceneManager.OnLoadEventCompleted -= OnLoadEventCompleted;
+            NetworkManager.SceneManager.OnSynchronizeComplete -= OnSynchronizeComplete;
             m_Subscription?.Dispose();
         }