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

Fixed bug that added bots and messed up controls

Former-commit-id: 29a6508

Author: MattMoradi

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;
             }