fix

Adding target client that is being sent to.

Author: NoelStephensUnity

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

@@ -1040,8 +1040,7 @@ internal void TrackRpcMetricsSend(ref ServerRpcMessage message, uint rpcMethodId
             }
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal void TrackRpcMetricsSend(ref RpcMessage message, int length)
+        internal void TrackRpcMetricsSend(ulong clientId, ref RpcMessage message, int length)
         {
             var type = GetType();
             if (!ValidateRpcMessageMetrics(type))

com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/BaseRpcTarget.cs

@@ -54,7 +54,8 @@ private protected void SendMessageToClient(NetworkBehaviour behaviour, ulong cli
         {
             var size = behaviour.NetworkManager.MessageManager.SendMessage(ref message, delivery, clientId);
 #if MULTIPLAYER_TOOLS && (DEVELOPMENT_BUILD || UNITY_EDITOR || UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE)
-            behaviour.TrackRpcMetricsSend(ref message, size);
+            // Send to a specific client
+            behaviour.TrackRpcMetricsSend(clientId, ref message, size);
 #endif
         }
     }

com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/LocalSendRpcTarget.cs

@@ -47,7 +47,8 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
                 length = tempBuffer.Length;
             }
 #if MULTIPLAYER_TOOLS && (DEVELOPMENT_BUILD || UNITY_EDITOR || UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE)
-            behaviour.TrackRpcMetricsSend(ref message, length);
+            // Local invocation sends to self
+            behaviour.TrackRpcMetricsSend(m_NetworkManager.LocalClientId, ref message, length);
 #endif
         }
 

com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ProxyRpcTargetGroup.cs

@@ -25,7 +25,10 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
             var proxyMessage = new ProxyMessage { Delivery = delivery, TargetClientIds = TargetClientIds.AsArray(), WrappedMessage = message };
             var size = behaviour.NetworkManager.MessageManager.SendMessage(ref proxyMessage, delivery, NetworkManager.ServerClientId);
 #if MULTIPLAYER_TOOLS && (DEVELOPMENT_BUILD || UNITY_EDITOR || UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE)
-            behaviour.TrackRpcMetricsSend(ref message, size);
+            foreach (var clientId in TargetClientIds)
+            {
+                behaviour.TrackRpcMetricsSend(clientId, ref message, size);
+            }
 #endif
 
             if (Ids.Contains(NetworkManager.ServerClientId))

com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs

@@ -44,9 +44,9 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
                     message.ReadBuffer = tempBuffer;
                     message.Handle(ref context);
 #if MULTIPLAYER_TOOLS && (DEVELOPMENT_BUILD || UNITY_EDITOR || UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE)
-                    behaviour.TrackRpcMetricsSend(ref message, tempBuffer.Length);
+                    // Local invocation sends to self
+                    behaviour.TrackRpcMetricsSend(m_NetworkManager.LocalClientId, ref message, tempBuffer.Length);
 #endif
-
                 }
                 else // Otherwise, send a proxied message to the owner of the object
                 {