fix: InstantiateAndSpawn not honoring ownerClientId parameter in client-server (#2968)

* fix

NetworkSpawnManager.InstantiateAndSpawn should use ownerClientId when not in distributed authority mode.

* fix

NetworkObject.InstantiateAndSpawn should use ownerClientId when not in distributed authority mode.

* test and update

Updated NetworkObjectSpawning to validate against InstantiateAndSpawn.
Updated ChangeLog entry.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -12,6 +12,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
+- Fixed issue where `NetworkSpawnManager.InstantiateAndSpawn` and `NetworkObject.InstantiateAndSpawn` were not honoring the ownerClientId parameter when using a client-server network topology. (#2968)
 - Fixed issue where internal delta serialization could not have a byte serializer defined when serializing deltas for other types. Added `[GenerateSerializationForType(typeof(byte))]` to both the `NetworkVariable` and `AnticipatedNetworkVariable` classes to assure a byte serializer is defined.(#2962)
 - Fixed issue when scene management was disabled and the session owner would still try to synchronize a late joining client. (#2962)
 - Fixed issue when using a distributed authority network topology where it would allow a session owner to spawn a `NetworkObject` prior to being approved. Now, an error message is logged and the `NetworkObject` will not be spawned prior to the client being approved.  (#2962)

com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

@@ -1643,7 +1643,7 @@ public NetworkObject InstantiateAndSpawn(NetworkManager networkManager, ulong ow
                 return null;
             }
 
-            ownerClientId = networkManager.DistributedAuthorityMode ? networkManager.LocalClientId : NetworkManager.ServerClientId;
+            ownerClientId = networkManager.DistributedAuthorityMode ? networkManager.LocalClientId : ownerClientId;
             // We only need to check for authority when running in client-server mode
             if (!networkManager.IsServer && !networkManager.DistributedAuthorityMode)
             {

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs

@@ -643,7 +643,7 @@ public NetworkObject InstantiateAndSpawn(NetworkObject networkPrefab, ulong owne
                 return null;
             }
 
-            ownerClientId = NetworkManager.DistributedAuthorityMode ? NetworkManager.LocalClientId : NetworkManager.ServerClientId;
+            ownerClientId = NetworkManager.DistributedAuthorityMode ? NetworkManager.LocalClientId : ownerClientId;
             // We only need to check for authority when running in client-server mode
             if (!NetworkManager.IsServer && !NetworkManager.DistributedAuthorityMode)
             {

testproject/Assets/Tests/Runtime/NetworkObjectSpawning.cs

@@ -138,6 +138,62 @@ public IEnumerator SpawnOnSynchronizedNotification([Values] SynchronizeNotificat
             }
         }
 
+
+        public enum InstantiateAndSpawnTypes
+        {
+            NetworkSpawnManager,
+            NetworkObject,
+        }
+
+        public enum InstantiateAndSpawnContexts
+        {
+            Host,
+            Client,
+        }
+
+        [UnityTest]
+        public IEnumerator InstantiateAndSpawn([Values] InstantiateAndSpawnTypes instantiateAndSpawnTypes, [Values] InstantiateAndSpawnContexts instantiateAndSpawnContexts)
+        {
+            m_CanStartServerAndClients = true;
+            Object.DontDestroyOnLoad(m_ObjectToSpawn);
+            yield return StartServerAndClients();
+            var instanceNetworkObject = (NetworkObject)null;
+            // Setup the test relative to parameters driven context
+            var ownerId = instantiateAndSpawnContexts == InstantiateAndSpawnContexts.Host ? m_ServerNetworkManager.LocalClientId : m_ClientNetworkManagers[0].LocalClientId;
+            var spawnManager = m_ServerNetworkManager.SpawnManager;
+            if (m_DistributedAuthority && instantiateAndSpawnContexts == InstantiateAndSpawnContexts.Client)
+            {
+                spawnManager = m_ClientNetworkManagers[0].SpawnManager;
+            }
+
+            // Spawn the NetworkObject
+            if (instantiateAndSpawnTypes == InstantiateAndSpawnTypes.NetworkSpawnManager)
+            {
+                Debug.Log($"Spawning {m_ObjectToSpawn.name}");
+                instanceNetworkObject = spawnManager.InstantiateAndSpawn(m_ObjectToSpawn.GetComponent<NetworkObject>(), ownerId);
+            }
+            else
+            {
+                instanceNetworkObject = NetworkObject.InstantiateAndSpawn(m_ObjectToSpawn, spawnManager.NetworkManager, ownerId);
+            }
+            Assert.IsNotNull(instanceNetworkObject, $"Failed to instantiate {m_ObjectToSpawn.name}!");
+            Assert.IsTrue(instanceNetworkObject.IsSpawned, $"Failed to spawn {m_ObjectToSpawn.name}!");
+            Assert.IsTrue(instanceNetworkObject.OwnerClientId == ownerId, $"Invalid owner ({instanceNetworkObject.OwnerClientId} vs {ownerId})!");
+            yield return WaitForConditionOrTimeOut(() => s_GlobalNetworkObjects.ContainsKey(m_ClientNetworkManagers[0].LocalClientId) && s_GlobalNetworkObjects.ContainsKey(m_ServerNetworkManager.LocalClientId));
+            AssertOnTimeout($"Timed out waiting for all instances to spawn!");
+            yield return WaitForConditionOrTimeOut(() => s_GlobalNetworkObjects[m_ClientNetworkManagers[0].LocalClientId].ContainsKey(instanceNetworkObject.NetworkObjectId) && s_GlobalNetworkObjects[m_ServerNetworkManager.LocalClientId].ContainsKey(instanceNetworkObject.NetworkObjectId));
+            AssertOnTimeout($"Timed out waiting for all instances to spawn!");
+
+            if (instantiateAndSpawnContexts == InstantiateAndSpawnContexts.Host)
+            {
+                Assert.IsTrue(s_GlobalNetworkObjects[m_ClientNetworkManagers[0].LocalClientId].ContainsKey(instanceNetworkObject.NetworkObjectId), $"Client-{m_ClientNetworkManagers[0].LocalClientId} failed to spawn {instanceNetworkObject.name}!");
+            }
+            else
+            {
+                Assert.IsTrue(s_GlobalNetworkObjects[m_ServerNetworkManager.LocalClientId].ContainsKey(instanceNetworkObject.NetworkObjectId), $"Client-{m_ServerNetworkManager.LocalClientId} failed to spawn {instanceNetworkObject.name}!");
+            }
+        }
+
         private void SceneLoaded(Scene scene, LoadSceneMode arg1)
         {
             if (scene.name == k_SceneToLoad)