Fixed spawning position and rotation defaults

Author: TwoTenPvP

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

@@ -125,7 +125,7 @@ internal set
         /// <param name="approved">Wheter or not the client was approved</param>
         /// <param name="position">The position to spawn the client at</param>
         /// <param name="rotation">The rotation to spawn the client with</param>
-        public delegate void ConnectionApprovedDelegate(uint clientId, int prefabId, bool approved, Vector3 position, Quaternion rotation);
+        public delegate void ConnectionApprovedDelegate(uint clientId, int prefabId, bool approved, Vector3? position, Quaternion? rotation);
         /// <summary>
         /// The callback to invoke during connection approval
         /// </summary>
@@ -1001,7 +1001,7 @@ private void SyncTime()
             }
         }
 
-        internal void HandleApproval(uint clientId, int prefabId, bool approved, Vector3 position, Quaternion rotation)
+        internal void HandleApproval(uint clientId, int prefabId, bool approved, Vector3? position, Quaternion? rotation)
         {
             if(approved)
             {

MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs

@@ -196,7 +196,7 @@ internal static void HandleConnectionRequest(uint clientId, Stream stream, int c
                 }
                 else
                 {
-                    netManager.HandleApproval(clientId, -1, true, Vector3.zero, Quaternion.identity);
+                    netManager.HandleApproval(clientId, -1, true, null, null);
                 }
             }
         }

MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs

@@ -189,7 +189,7 @@ internal static void MarkSceneObjects()
             }
         }
 
-        internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint networkId, uint owner, bool playerObject, uint sceneSpawnedInIndex, bool sceneDelayedSpawn, bool destroyWithScene, Vector3 position, Quaternion rotation, bool isActive, Stream stream, bool readPayload, int payloadLength, bool readNetworkedVar)
+        internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint networkId, uint owner, bool playerObject, uint sceneSpawnedInIndex, bool sceneDelayedSpawn, bool destroyWithScene, Vector3? position, Quaternion? rotation, bool isActive, Stream stream, bool readPayload, int payloadLength, bool readNetworkedVar)
         {
             if (networkedPrefabId >= netManager.NetworkConfig.NetworkedPrefabs.Count || networkedPrefabId < 0)
             {
@@ -203,7 +203,7 @@ internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint
                 GameObject prefab = netManager.NetworkConfig.NetworkedPrefabs[networkedPrefabId].prefab;
                 bool prefabActive = prefab.activeSelf;
                 prefab.SetActive(false);
-                GameObject go = MonoBehaviour.Instantiate(prefab, position, rotation);
+                GameObject go = (position == null && rotation == null) ? MonoBehaviour.Instantiate(prefab) : MonoBehaviour.Instantiate(prefab, position.GetValueOrDefault(Vector3.zero), rotation.GetValueOrDefault(Quaternion.identity));
                 prefab.SetActive(prefabActive);
 
                 //Appearantly some wierd behavior when switching scenes can occur that destroys this object even though the scene is
@@ -227,8 +227,6 @@ internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint
                 netObject.destroyWithScene = destroyWithScene;
                 netObject.OwnerClientId = owner;
                 netObject.isPlayerObject = playerObject;
-                netObject.transform.position = position;
-                netObject.transform.rotation = rotation;
                 netObject.SceneDelayedSpawn = sceneDelayedSpawn;
                 netObject.sceneSpawnedInIndex = sceneSpawnedInIndex;
 
@@ -265,7 +263,9 @@ internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint
 
             //Normal spawning
             { 
-                GameObject go = MonoBehaviour.Instantiate(netManager.NetworkConfig.NetworkedPrefabs[networkedPrefabId].prefab, position, rotation);
+                GameObject prefab = netManager.NetworkConfig.NetworkedPrefabs[networkedPrefabId].prefab;
+                GameObject go = (position == null && rotation == null) ? MonoBehaviour.Instantiate(prefab) : MonoBehaviour.Instantiate(prefab, position.GetValueOrDefault(Vector3.zero), rotation.GetValueOrDefault(Quaternion.identity));
+
                 NetworkedObject netObject = go.GetComponent<NetworkedObject>();
                 if (netObject == null)
                 {
@@ -285,8 +285,6 @@ internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint
                 netObject.destroyWithScene = destroyWithScene;
                 netObject.OwnerClientId = owner;
                 netObject.isPlayerObject = playerObject;
-                netObject.transform.position = position;
-                netObject.transform.rotation = rotation;
                 netObject.SceneDelayedSpawn = sceneDelayedSpawn;
                 netObject.sceneSpawnedInIndex = sceneSpawnedInIndex;