fix: OnClientReady is called and passed the appropriate ready state v…

…alue in NetworkLobbyPlayer (#618)
MirageNet · Mar 21, 2019 · c9eac57 · c9eac57
1 parent 28b067d
commit c9eac57
Showing 1 changed file with 29 additions and 11 deletions.
diff --git a/Assets/Mirror/Components/NetworkLobbyPlayer.cs b/Assets/Mirror/Components/NetworkLobbyPlayer.cs
@@ -10,12 +10,14 @@ public class NetworkLobbyPlayer : NetworkBehaviour
     {
         public bool ShowLobbyGUI = true;
 
-        [SyncVar]
+        [SyncVar(hook=nameof(ReadyStateChanged))]
         public bool ReadyToBegin;
 
         [SyncVar]
         public int Index;
 
+        #region Unity Callbacks
+
         /// <summary>
         /// Do not use Start - Override OnStartrHost / OnStartClient instead!
         /// </summary>
@@ -34,15 +36,9 @@ void OnDisable()
             SceneManager.sceneLoaded -= ClientLoadedScene;
         }
 
-        public virtual void ClientLoadedScene(Scene arg0, LoadSceneMode arg1)
-        {
-            NetworkLobbyManager lobby = NetworkManager.singleton as NetworkLobbyManager;
-            if (lobby != null && SceneManager.GetActiveScene().name == lobby.LobbyScene)
-                return;
+        #endregion
 
-            if (this != null && isLocalPlayer)
-                CmdSendLevelLoaded();
-        }
+        #region Commands
 
         [Command]
         public void CmdChangeReadyState(bool ReadyState)
@@ -59,17 +55,39 @@ public void CmdSendLevelLoaded()
             lobby?.PlayerLoadedScene(GetComponent<NetworkIdentity>().connectionToClient);
         }
 
-        #region lobby client virtuals
+        #endregion
+
+        #region SyncVar Hooks
+
+        private void ReadyStateChanged(bool NewReadyState)
+        {
+            ReadyToBegin = NewReadyState;
+            OnClientReady(ReadyToBegin);
+        }
+
+        #endregion
+
+        #region Lobby Client Virtuals
 
         public virtual void OnClientEnterLobby() {}
 
         public virtual void OnClientExitLobby() {}
 
         public virtual void OnClientReady(bool readyState) {}
 
+        public virtual void ClientLoadedScene(Scene arg0, LoadSceneMode arg1)
+        {
+            NetworkLobbyManager lobby = NetworkManager.singleton as NetworkLobbyManager;
+            if (lobby != null && SceneManager.GetActiveScene().name == lobby.LobbyScene)
+                return;
+
+            if (this != null && isLocalPlayer)
+                CmdSendLevelLoaded();
+        }
+
         #endregion
 
-        #region optional UI
+        #region Optional UI
 
         public virtual void OnGUI()
         {