update

Migrating all NetworkTransform serialization into the NetworkTransformMessage.
Removing legacy observers for the NetworkTransform.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs

@@ -4493,38 +4493,6 @@ internal void UpdateParenting(NetworkObjectReference parent, bool worldPositionS
             }
         }
 
-        internal void SerializeMessage(FastBufferWriter writer, int targetVersion)
-        {
-            var networkObject = NetworkObject;
-
-            // Provides the source of the message (NetworkObject-->NetworkTransform : NetworkBehaviour)
-            BytePacker.WriteValueBitPacked(writer, NetworkObjectId);
-            BytePacker.WriteValueBitPacked(writer, (int)NetworkBehaviourId);
-
-            // Serialzie the state
-            writer.WriteNetworkSerializable(m_LocalAuthoritativeNetworkState);
-
-            // DA TODO: Update the CMB Service NetworkTransform protocol to
-            // handle this varying payload after the NetworkTransformState
-            // Serialzie any parenting directive
-            m_OutboundMessage.SerializeParent(writer);
-
-            if (m_CachedNetworkManager.DistributedAuthorityMode)
-            {
-                BytePacker.WriteValuePacked(writer, networkObject.Observers.Count - 1);
-
-                foreach (var targetId in networkObject.Observers)
-                {
-                    if (OwnerClientId == targetId)
-                    {
-                        continue;
-                    }
-                    BytePacker.WriteValuePacked(writer, targetId);
-                }
-            }
-
-        }
-
         /// <summary>
         /// Invoked by the authoritative instance to sends a <see cref="NetworkTransformMessage"/> containing the <see cref="NetworkTransformState"/>
         /// </summary>

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

@@ -73,7 +73,15 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
             else
             {
                 var position = writer.Position;
-                NetworkTransform.SerializeMessage(writer, targetVersion);
+                // Provides the source of the message (NetworkObject-->NetworkTransform : NetworkBehaviour).
+                BytePacker.WriteValueBitPacked(writer, NetworkTransform.NetworkObjectId);
+                BytePacker.WriteValueBitPacked(writer, (int)NetworkTransform.NetworkBehaviourId);
+
+                // Serialize the current local state.
+                writer.WriteNetworkSerializable(NetworkTransform.LocalAuthoritativeNetworkState);
+
+                // Write out any parenting directive associated with this update.
+                SerializeParent(writer);
                 BytesWritten = writer.Position - position;
             }
         }
@@ -163,22 +171,22 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
             {
                 if (ownerAuthoritativeServerSide)
                 {
-                    var targetCount = 1;
-
-                    if (networkManager.DistributedAuthorityMode && networkManager.DAHost)
-                    {
-                        ByteUnpacker.ReadValueBitPacked(reader, out targetCount);
-                    }
+                    var targetCount = networkObject.Observers.Count;
 
                     var targetIds = stackalloc ulong[targetCount];
 
                     if (networkManager.DistributedAuthorityMode && networkManager.DAHost)
                     {
-                        var targetId = (ulong)0;
-                        for (int i = 0; i < targetCount; i++)
+                        var count = 0;
+                        foreach (var targetId in networkObject.Observers)
                         {
-                            ByteUnpacker.ReadValueBitPacked(reader, out targetId);
-                            targetIds[i] = targetId;
+                            targetIds[count] = targetId;
+                            count++;
+                            // Sanity check, this should never happen.
+                            if (count >= targetCount)
+                            {
+                                Debug.LogError($"[{nameof(NetworkTransformMessage)}] Exceeded total number of observers!");
+                            }
                         }
                     }