fix: Host Player Ready Race Condition (#1498)

MirageNet · Feb 15, 2020 · 4c4a52b · 4c4a52b
1 parent da79d69
commit 4c4a52b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Assets/Mirror/Runtime/ClientScene.cs b/Assets/Mirror/Runtime/ClientScene.cs
@@ -182,10 +182,15 @@ public static bool Ready(NetworkConnection conn)
 
             if (conn != null)
             {
-                conn.Send(new ReadyMessage());
+                // Set these before sending the ReadyMessage, otherwise host client
+                // will fail in InternalAddPlayer with null readyConnection.
                 ready = true;
                 readyConnection = conn;
                 readyConnection.isReady = true;
+
+                // Tell server we're ready to have a player object spawned
+                conn.Send(new ReadyMessage());
+
                 return true;
             }
             Debug.LogError("Ready() called with invalid connection object: conn=null");