Merge pull request #481 from Autodesk/multiplayer-fix-4.3.3.0

Fixed bug that added bots and messed up controls
Autodesk · Jan 14, 2020 · 29a6508 · 29a6508
2 parents d1fc0c1 + 3421654
commit 29a6508
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/engine/Assets/Scripts/States/MainState.cs b/engine/Assets/Scripts/States/MainState.cs
@@ -530,16 +530,17 @@ public bool ChangeRobot(string directory, bool isMixAndMatch)
             UnityEngine.Object.Destroy(SpawnedRobots[index].gameObject);
             ActiveRobot = null;
 
-            int i = 0;
-            foreach (SimulatorRobot robot in SpawnedRobots)
-            {
-                robot.ControlIndex = i;
-                i++;
-            }
-
-            if (LoadRobot(directory, isMixAndMatch))
+            if (LoadRobot(directory, isMixAndMatch, index))
             {
                 DynamicCamera.ControlEnabled = true;
+
+                int i = 0;
+                foreach (SimulatorRobot robot in SpawnedRobots)
+                {
+                    robot.ControlIndex = i;
+                    i++;
+                }
+
                 return true;
             }