fix

This resolves the NetworkShow, ChangeOwnership, and then the additional ChangeOwnershipMessage issue for host, server, and DAHost.

For the CMB service, we need to adjust ChangeOwnershipMessage to contain the list of target client identifiers the message should be sent to.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ChangeOwnershipMessage.cs

@@ -333,7 +333,7 @@ private void HandleOwnershipChange(ref NetworkContext context)
             if (networkObject.OwnerClientId == OwnerClientId)
             {
                 // Log error and then ignore the message
-                UnityEngine.Debug.LogError($"Client-{context.SenderId} ({RequestClientId}) sent unnecessary ownership changed message for {NetworkObjectId}.");
+                NetworkLog.LogError($"[Receiver: Client-{networkManager.LocalClientId}][Sender: Client-{context.SenderId}][RID: {RequestClientId}] Detected unnecessary ownership changed message for {networkObject.name} (NID:{NetworkObjectId}).");
                 return;
             }
 

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

@@ -565,6 +565,19 @@ internal void ChangeOwnership(NetworkObject networkObject, ulong clientId, bool
             }
 
             var size = 0;
+            var clientsToShow = new List<ulong>();
+            if (ClientsToShowObject.ContainsKey(networkObject))
+            {
+                clientsToShow = ClientsToShowObject[networkObject];
+            }
+            if (ObjectsToShowToClient.ContainsKey(clientId))
+            {
+                if (ObjectsToShowToClient[clientId].Contains(networkObject))
+                {
+                    clientsToShow.Add(clientId);
+                }
+            }
+
             if (NetworkManager.DistributedAuthorityMode)
             {
                 var message = new ChangeOwnershipMessage
@@ -578,24 +591,29 @@ internal void ChangeOwnership(NetworkObject networkObject, ulong clientId, bool
                     OwnershipFlags = (ushort)networkObject.Ownership,
                 };
                 // If we are connected to the CMB service or not the DAHost (i.e. pure DA-Clients only)
+
                 if (NetworkManager.CMBServiceConnection || !NetworkManager.DAHost)
                 {
                     // Always update the network properties in distributed authority mode for the client gaining ownership
                     for (int i = 0; i < networkObject.ChildNetworkBehaviours.Count; i++)
                     {
                         networkObject.ChildNetworkBehaviours[i].UpdateNetworkProperties();
                     }
+                    // DANGO-TODO: We have no current way of handling the list of clients that should receive this message.
+                    // --- NGO: Extend ChangeOwnershipMessage to contain a list of client identifiers that
+                    // --- CMB Service: Needs to be adjusted to only forward the message provided in the list of client identifiers.
                     size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, NetworkManager.ServerClientId);
                     NetworkManager.NetworkMetrics.TrackOwnershipChangeSent(NetworkManager.LocalClientId, networkObject, size);
                 }
                 else // We are the DAHost so broadcast the ownership change
                 {
                     foreach (var client in NetworkManager.ConnectedClients)
                     {
-                        if (client.Value.ClientId == NetworkManager.ServerClientId)
+                        if (client.Value.ClientId == NetworkManager.ServerClientId || IsObjectVisibilityPending(client.Key, ref networkObject))
                         {
                             continue;
                         }
+
                         if (networkObject.IsNetworkVisibleTo(client.Value.ClientId))
                         {
                             size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, client.Value.ClientId);
@@ -613,8 +631,17 @@ internal void ChangeOwnership(NetworkObject networkObject, ulong clientId, bool
                 };
                 foreach (var client in NetworkManager.ConnectedClients)
                 {
+                    if (client.Value.ClientId == NetworkManager.ServerClientId || IsObjectVisibilityPending(client.Key, ref networkObject))
+                    {
+                        continue;
+                    }
                     if (networkObject.IsNetworkVisibleTo(client.Value.ClientId))
                     {
+                        Debug.Log($"[ChangeOwnership] Sending change ownership message to Client-{client.Key}");
+                        if (client.Key != client.Value.ClientId)
+                        {
+                            throw new Exception($"Client key {client.Key} does not match the Client Id {client.Value.ClientId}");
+                        }
                         size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, client.Value.ClientId);
                         NetworkManager.NetworkMetrics.TrackOwnershipChangeSent(client.Key, networkObject, size);
                     }
@@ -639,6 +666,27 @@ internal void ChangeOwnership(NetworkObject networkObject, ulong clientId, bool
             }
         }
 
+        /// <summary>
+        /// Will determine if a client has been granted visibility for a NetworkObject but
+        /// the <see cref="CreateObjectMessage"/> has yet to be generated for it. Under this case,
+        /// the client might not need to be sent a message (i.e. <see cref="ChangeOwnershipMessage")
+        /// </summary>
+        /// <param name="clientId">the client to check</param>
+        /// <param name="networkObject">the <see cref="NetworkObject"/> to check if it is pending show</param>
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
+        internal bool IsObjectVisibilityPending(ulong clientId, ref NetworkObject networkObject)
+        {
+            if (NetworkManager.DistributedAuthorityMode && ClientsToShowObject.ContainsKey(networkObject))
+            {
+                return ClientsToShowObject[networkObject].Contains(clientId);
+            }
+            else if (ObjectsToShowToClient.ContainsKey(clientId))
+            {
+                return ObjectsToShowToClient[clientId].Contains(networkObject);
+            }
+            return false;
+        }
+
         internal bool HasPrefab(NetworkObject.SceneObject sceneObject)
         {
             if (!NetworkManager.NetworkConfig.EnableSceneManagement || !sceneObject.IsSceneObject)