fix(spawning): Fixed ownership indexing for server instances

Author: TwoTenPvP

MLAPI/MonoBehaviours/Core/NetworkedObject.cs

@@ -54,7 +54,8 @@ internal set
                     _ownerClientId = value;
             }
         }
-        private ulong? _ownerClientId = null;
+        
+        internal ulong? _ownerClientId = null;
 
         /// <summary>
         /// InstanceId is the id that is unique to the object and scene for a scene object when UsePrefabSync is false.
@@ -236,7 +237,7 @@ public void Spawn(Stream spawnPayload = null, bool destroyWithScene = false)
             if (spawnPayload != null)
                 spawnPayload.Position = 0;
 
-            SpawnManager.SpawnNetworkedObjectLocally(this, SpawnManager.GetNetworkObjectId(), false, false, NetworkingManager.Singleton.ServerClientId, spawnPayload, spawnPayload != null, spawnPayload == null ? 0 : (int)spawnPayload.Length, false, destroyWithScene);
+            SpawnManager.SpawnNetworkedObjectLocally(this, SpawnManager.GetNetworkObjectId(), false, false, null, spawnPayload, spawnPayload != null, spawnPayload == null ? 0 : (int)spawnPayload.Length, false, destroyWithScene);
 
             for (int i = 0; i < NetworkingManager.Singleton.ConnectedClientsList.Count; i++)
             {

MLAPI/NetworkingManagerComponents/Core/NetworkSceneManager.cs

@@ -198,7 +198,7 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid)
                 {
                     if (networkedObjects[i].IsSceneObject == null)
                     {
-                        SpawnManager.SpawnNetworkedObjectLocally(networkedObjects[i], SpawnManager.GetNetworkObjectId(), true, false, NetworkingManager.Singleton.ServerClientId, null, false, 0, false, true);
+                        SpawnManager.SpawnNetworkedObjectLocally(networkedObjects[i], SpawnManager.GetNetworkObjectId(), true, false, null, null, false, 0, false, true);
 
                         newSceneObjects.Add(networkedObjects[i]);
                     }

MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs

@@ -255,7 +255,7 @@ internal static NetworkedObject CreateLocalNetworkedObject(bool softCreate, ulon
         }
 
         // Ran on both server and client
-        internal static void SpawnNetworkedObjectLocally(NetworkedObject netObject, ulong networkId, bool sceneObject, bool playerObject, ulong ownerClientId, Stream dataStream, bool readPayload, int payloadLength, bool readNetworkedVar, bool destroyWithScene)
+        internal static void SpawnNetworkedObjectLocally(NetworkedObject netObject, ulong networkId, bool sceneObject, bool playerObject, ulong? ownerClientId, Stream dataStream, bool readPayload, int payloadLength, bool readNetworkedVar, bool destroyWithScene)
         {
             if (netObject == null)
             {
@@ -279,34 +279,37 @@ internal static void SpawnNetworkedObjectLocally(NetworkedObject netObject, ulon
 
             netObject.DestroyWithScene = sceneObject || destroyWithScene;
 
-            netObject.OwnerClientId = ownerClientId;
+            netObject._ownerClientId = ownerClientId;
             netObject.IsPlayerObject = playerObject;
 
             SpawnedObjects.Add(netObject.NetworkId, netObject);
             SpawnedObjectsList.Add(netObject);
 
-            if (NetworkingManager.Singleton.IsServer)
+            if (ownerClientId != null)
             {
-                if (playerObject) 
+                if (NetworkingManager.Singleton.IsServer)
                 {
-                    NetworkingManager.Singleton.ConnectedClients[ownerClientId].PlayerObject = netObject;
-                }
-                else
-                {
-                    NetworkingManager.Singleton.ConnectedClients[ownerClientId].OwnedObjects.Add(netObject);
-                }
-
-                for (int i = 0; i < NetworkingManager.Singleton.ConnectedClientsList.Count; i++)
-                {
-                    if (netObject.CheckObjectVisibility == null || netObject.CheckObjectVisibility(NetworkingManager.Singleton.ConnectedClientsList[i].ClientId))
+                    if (playerObject) 
+                    {
+                        NetworkingManager.Singleton.ConnectedClients[ownerClientId.Value].PlayerObject = netObject;
+                    }
+                    else
                     {
-                        netObject.observers.Add(NetworkingManager.Singleton.ConnectedClientsList[i].ClientId);
+                        NetworkingManager.Singleton.ConnectedClients[ownerClientId.Value].OwnedObjects.Add(netObject);
+                    }
+                    
+                    for (int i = 0; i < NetworkingManager.Singleton.ConnectedClientsList.Count; i++)
+                    {
+                        if (netObject.CheckObjectVisibility == null || netObject.CheckObjectVisibility(NetworkingManager.Singleton.ConnectedClientsList[i].ClientId))
+                        {
+                            netObject.observers.Add(NetworkingManager.Singleton.ConnectedClientsList[i].ClientId);
+                        }
                     }
                 }
-            }
-            else if (playerObject && ownerClientId == NetworkingManager.Singleton.LocalClientId)
-            {
-                NetworkingManager.Singleton.ConnectedClients[ownerClientId].PlayerObject = netObject;
+                else if (playerObject && ownerClientId.Value == NetworkingManager.Singleton.LocalClientId)
+                {
+                    NetworkingManager.Singleton.ConnectedClients[ownerClientId.Value].PlayerObject = netObject;
+                }   
             }
 
             if (readPayload)
@@ -467,7 +470,7 @@ internal static void ServerSpawnSceneObjectsOnStartSweep()
             {
                 if (networkedObjects[i].IsSceneObject == null)
                 {
-                    SpawnNetworkedObjectLocally(networkedObjects[i], GetNetworkObjectId(), true, false, NetworkingManager.Singleton.ServerClientId, null, false, 0, false, true);
+                    SpawnNetworkedObjectLocally(networkedObjects[i], GetNetworkObjectId(), true, false, null, null, false, 0, false, true);
                 }
             }
         }