Merge branch 'develop' into feature/track_local_execution

Author: kvassall-unity

com.unity.netcode.adapter.utp/Tests/Runtime/Helpers/RuntimeTestsHelpers.cs

@@ -10,7 +10,7 @@ namespace Unity.Netcode.UTP.RuntimeTests
     public static class RuntimeTestsHelpers
     {
         // 50ms should be plenty enough for any network interaction to occur (even roundtrips).
-#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX
+#if UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX || UNITY_ANDROID
         public const float MaxNetworkEventWaitTime = 0.35f;
 #else
         public const float MaxNetworkEventWaitTime = 0.15f;

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

@@ -1335,7 +1335,7 @@ internal void OnClientDisconnectFromServer(ulong clientId)
                         }
                     }
 
-                    for (int i = 0; i < networkClient.OwnedObjects.Count; i++)
+                    for (int i = networkClient.OwnedObjects.Count - 1; i >= 0; i--)
                     {
                         var ownedObject = networkClient.OwnedObjects[i];
                         if (ownedObject != null)

com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDontDestroyWithOwnerTests.cs

@@ -0,0 +1,77 @@
+using System.Collections;
+using System.Collections.Generic;
+using NUnit.Framework;
+using UnityEngine;
+using UnityEngine.TestTools;
+using Object = UnityEngine.Object;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    public class NetworkObjectDontDestroyWithOwnerTests
+    {
+        [UnityTest]
+        public IEnumerator DontDestroyWithOwnerTest()
+        {
+            // create server and client instances
+            MultiInstanceHelpers.Create(1, out NetworkManager server, out NetworkManager[] clients);
+
+            // create prefab
+            var gameObject = new GameObject("ClientOwnedObject");
+            var networkObject = gameObject.AddComponent<NetworkObject>();
+            networkObject.DontDestroyWithOwner = true;
+            MultiInstanceHelpers.MakeNetworkObjectTestPrefab(networkObject);
+
+            server.NetworkConfig.NetworkPrefabs.Add(new NetworkPrefab()
+            {
+                Prefab = gameObject
+            });
+
+            for (int i = 0; i < clients.Length; i++)
+            {
+                clients[i].NetworkConfig.NetworkPrefabs.Add(new NetworkPrefab()
+                {
+                    Prefab = gameObject
+                });
+            }
+
+            // start server and connect clients
+            MultiInstanceHelpers.Start(false, server, clients);
+
+            // wait for connection on client side
+            yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForClientsConnected(clients));
+
+            // wait for connection on server side
+            yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForClientConnectedToServer(server));
+
+            // network objects
+            var networkObjects = new List<NetworkObject>();
+
+            // create instances
+            for (int i = 0; i < 32; i++)
+            {
+                var no = Object.Instantiate(gameObject).GetComponent<NetworkObject>();
+                no.NetworkManagerOwner = server;
+                networkObjects.Add(no);
+                no.SpawnWithOwnership(clients[0].LocalClientId);
+            }
+
+            // wait for object spawn on client
+            yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForCondition(() => clients[0].SpawnManager.SpawnedObjects.Count == 32));
+
+            // disconnect the client that owns all the clients
+            MultiInstanceHelpers.StopOneClient(clients[0]);
+
+            // wait for disconnect
+            yield return MultiInstanceHelpers.Run(MultiInstanceHelpers.WaitForCondition(() => server.ConnectedClients.Count == 0));
+
+            for (int i = 0; i < networkObjects.Count; i++)
+            {
+                // ensure ownership was transferred back
+                Assert.That(networkObjects[i].OwnerClientId == server.ServerClientId);
+            }
+
+            // cleanup
+            MultiInstanceHelpers.Destroy();
+        }
+    }
+}

com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDontDestroyWithOwnerTests.cs.meta

@@ -230,17 +230,15 @@ public override void Send(ulong clientId, ArraySegment<byte> payload, NetworkDel
                 byte[] copy = new byte[payload.Count];
                 Buffer.BlockCopy(payload.Array, payload.Offset, copy, 0, payload.Count);
 
-                if (!m_Peers.ContainsKey(clientId))
+                if (m_Peers.ContainsKey(clientId))
                 {
-                    throw new KeyNotFoundException($"peer id {clientId} not in peer list");
+                    m_Peers[clientId].IncomingBuffer.Enqueue(new Event
+                    {
+                        Type = NetworkEvent.Data,
+                        ConnectionId = m_LocalConnection.ConnectionId,
+                        Data = new ArraySegment<byte>(copy)
+                    });
                 }
-
-                m_Peers[clientId].IncomingBuffer.Enqueue(new Event
-                {
-                    Type = NetworkEvent.Data,
-                    ConnectionId = m_LocalConnection.ConnectionId,
-                    Data = new ArraySegment<byte>(copy)
-                });
             }
         }