fix: fixing MTT-1299 (#1227)

* fix: fixing MTT-1299

Author: andrews-unity

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

@@ -69,17 +69,20 @@ internal void __sendServerRpc(FastBufferWriter writer, uint rpcMethodId, ServerR
                 RpcData = writer
             };
 
+            var rpcMessageSize = 0;
+
             // If we are a server/host then we just no op and send to ourself
             if (IsHost || IsServer)
             {
-                var tempBuffer = new FastBufferReader(writer, Allocator.Temp);
-                message.Handle(tempBuffer, NetworkManager, NetworkBehaviourId);
-                tempBuffer.Dispose();
-
-                return;
+                using var tempBuffer = new FastBufferReader(writer, Allocator.Temp);
+                message.Handle(tempBuffer, NetworkManager, NetworkManager.ServerClientId);
+                rpcMessageSize = tempBuffer.Length;
+            }
+            else
+            {
+                rpcMessageSize = NetworkManager.SendMessage(message, networkDelivery, NetworkManager.ServerClientId);
             }
 
-            var rpcMessageSize = NetworkManager.SendMessage(message, networkDelivery, NetworkManager.ServerClientId, true);
 
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
             if (NetworkManager.__rpc_name_table.TryGetValue(rpcMethodId, out var rpcMethodName))
@@ -129,17 +132,48 @@ internal unsafe void __sendClientRpc(FastBufferWriter writer, uint rpcMethodId,
             };
             int messageSize;
 
+            // We check to see if we need to shortcut for the case where we are the host/server and we can send a clientRPC
+            // to ourself. Sadly we have to figure that out from the list of clientIds :( 
+            bool shouldSendToHost = false;
+
             if (rpcParams.Send.TargetClientIds != null)
             {
-                messageSize = NetworkManager.SendMessage(message, networkDelivery, in rpcParams.Send.TargetClientIds, true);
+                foreach (var clientId in rpcParams.Send.TargetClientIds)
+                {
+                    if (clientId == NetworkManager.ServerClientId)
+                    {
+                        shouldSendToHost = true;
+                        break;
+                    }
+                }
+
+                messageSize = NetworkManager.SendMessage(message, networkDelivery, in rpcParams.Send.TargetClientIds);
             }
             else if (rpcParams.Send.TargetClientIdsNativeArray != null)
             {
+                foreach (var clientId in rpcParams.Send.TargetClientIdsNativeArray)
+                {
+                    if (clientId == NetworkManager.ServerClientId)
+                    {
+                        shouldSendToHost = true;
+                        break;
+                    }
+                }
+
                 messageSize = NetworkManager.SendMessage(message, networkDelivery, rpcParams.Send.TargetClientIdsNativeArray.Value);
             }
             else
             {
-                messageSize = NetworkManager.SendMessage(message, networkDelivery, NetworkManager.ConnectedClientsIds, true);
+                shouldSendToHost = IsHost;
+                messageSize = NetworkManager.SendMessage(message, networkDelivery, NetworkManager.ConnectedClientsIds);
+            }
+
+            // If we are a server/host then we just no op and send to ourself
+            if (shouldSendToHost)
+            {
+                using var tempBuffer = new FastBufferReader(writer, Allocator.Temp);
+                message.Handle(tempBuffer, NetworkManager, NetworkManager.ServerClientId);
+                messageSize = tempBuffer.Length;
             }
 
 #if DEVELOPMENT_BUILD || UNITY_EDITOR

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

@@ -1297,12 +1297,12 @@ private void HandleRawTransportPoll(NetworkEvent networkEvent, ulong clientId, A
             }
         }
 
-        public unsafe int SendMessage<TMessageType, TClientIdListType>(in TMessageType message, NetworkDelivery delivery, in TClientIdListType clientIds, bool serverCanSendToServerId = false)
+        public unsafe int SendMessage<TMessageType, TClientIdListType>(in TMessageType message, NetworkDelivery delivery, in TClientIdListType clientIds)
             where TMessageType : INetworkMessage
             where TClientIdListType : IReadOnlyList<ulong>
         {
             // Prevent server sending to itself
-            if (IsServer && !serverCanSendToServerId)
+            if (IsServer)
             {
                 ulong* nonServerIds = stackalloc ulong[clientIds.Count];
                 int newIdx = 0;
@@ -1326,11 +1326,11 @@ public unsafe int SendMessage<TMessageType, TClientIdListType>(in TMessageType m
         }
 
         public unsafe int SendMessage<T>(in T message, NetworkDelivery delivery,
-            ulong* clientIds, int numClientIds, bool serverCanSendToServerId = false)
+            ulong* clientIds, int numClientIds)
             where T : INetworkMessage
         {
             // Prevent server sending to itself
-            if (IsServer && !serverCanSendToServerId)
+            if (IsServer)
             {
                 ulong* nonServerIds = stackalloc ulong[numClientIds];
                 int newIdx = 0;
@@ -1360,11 +1360,11 @@ internal unsafe int SendMessage<T>(in T message, NetworkDelivery delivery, in Na
             return SendMessage(message, delivery, (ulong*)clientIds.GetUnsafePtr(), clientIds.Length);
         }
 
-        public int SendMessage<T>(in T message, NetworkDelivery delivery, ulong clientId, bool serverCanSendToServerId = false)
+        public int SendMessage<T>(in T message, NetworkDelivery delivery, ulong clientId)
             where T : INetworkMessage
         {
             // Prevent server sending to itself
-            if (IsServer && clientId == ServerClientId && !serverCanSendToServerId)
+            if (IsServer && clientId == ServerClientId)
             {
                 return 0;
             }

testproject/Assets/Tests/Runtime/MessageOrdering.cs

@@ -147,7 +147,7 @@ public IEnumerator SpawnRpcDespawn()
             int expectedCount = Support.SpawnRpcDespawn.ClientUpdateCount + 1;
             const int maxFrames = 240;
             var doubleCheckTime = Time.realtimeSinceStartup + 5.0f;
-            while (Support.SpawnRpcDespawn.ClientUpdateCount < expectedCount)
+            while (Support.SpawnRpcDespawn.ClientUpdateCount < expectedCount && !handler.WasSpawned)
             {
                 if (Time.frameCount > maxFrames)
                 {
@@ -165,7 +165,6 @@ public IEnumerator SpawnRpcDespawn()
 
             Assert.AreEqual(NetworkUpdateStage.EarlyUpdate, Support.SpawnRpcDespawn.StageExecutedByReceiver);
             Assert.AreEqual(Support.SpawnRpcDespawn.ServerUpdateCount, Support.SpawnRpcDespawn.ClientUpdateCount);
-            Assert.True(handler.WasSpawned);
             var lastFrameNumber = Time.frameCount + 1;
             yield return new WaitUntil(() => Time.frameCount >= lastFrameNumber);
             Assert.True(handler.WasDestroyed);