Merge branch 'develop-2.0.0' into fix/multiple-transport-connection-events

Author: EmandM

.yamato/project-standards.yml

@@ -47,7 +47,9 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
 
     - unity-downloader-cli --fast --wait -u {{ editor }} -c editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloads basic editor
     - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ project.path }} -quit # This command is used to invoke Unity in a "headless" mode. It's used to sync the project
-    - dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --check # Runs standards check
+    - dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix # Auto-fix formatting issues
+    - git checkout -- {{ project.path }}/Packages/manifest.json {{ project.path }}/Packages/packages-lock.json {{ project.path }}/ProjectSettings/ProjectVersion.txt 2>/dev/null || true # Restore files that Unity may have modified (we only want to check code formatting)
+    - 'git diff --exit-code || (echo "ERROR: Code formatting issues found. Run dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix locally and commit the changes." && exit 1)' # Fail if formatter made any changes
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}

.yamato/project.metafile

@@ -24,7 +24,7 @@
 small_agent_platform:
     - name: ubuntu
       type: Unity::VM
-      image: package-ci/ubuntu-22.04:v4.77.0
+      image: package-ci/ubuntu-22.04:v4.81.0
       flavor: b1.small
 
 
@@ -39,13 +39,13 @@ test_platforms:
     default:
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.77.0
+          image: package-ci/ubuntu-22.04:v4.81.0
           flavor: b1.large
           standalone: StandaloneLinux64
     desktop:
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.77.0
+          image: package-ci/ubuntu-22.04:v4.81.0
           flavor: b1.large
           smaller_flavor: b1.medium
           larger_flavor: b1.xlarge

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -29,6 +29,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 ### Fixed
 
 - Duplicate transport connection events for the same connection will now do nothing. (#3863)
+- Fixed memory leak in `NetworkAnimator` on clients where `RpcTarget` groups were not being properly disposed due to incorrect type casting of `ProxyRpcTargetGroup` to `RpcTargetGroup`.
 - Fixed issue when using a client-server topology where a `NetworkList` with owner write permissions was resetting sent time and dirty flags after having been spawned on owning clients that were not the spawn authority. (#3850)
 - Fixed an integer overflow that occurred when configuring a large disconnect timeout with Unity Transport. (#3810)
 

com.unity.netcode.gameobjects/Editor/NetworkRigidbodyBaseEditor.cs

@@ -33,7 +33,11 @@ private void DisplayNetworkRigidbodyProperties()
         public override void OnInspectorGUI()
         {
             var networkRigidbodyBase = target as NetworkRigidbodyBase;
-            void SetExpanded(bool expanded) { networkRigidbodyBase.NetworkRigidbodyBaseExpanded = expanded; };
+            void SetExpanded(bool expanded)
+            {
+                networkRigidbodyBase.NetworkRigidbodyBaseExpanded = expanded;
+            }
+
             DrawFoldOutGroup<NetworkRigidbodyBase>(networkRigidbodyBase.GetType(), DisplayNetworkRigidbodyProperties, networkRigidbodyBase.NetworkRigidbodyBaseExpanded, SetExpanded);
             base.OnInspectorGUI();
         }

com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs

@@ -307,7 +307,11 @@ private void DrawToggleProperty(Rect rect, string label, SerializedProperty prop
         public override void OnInspectorGUI()
         {
             var networkTransform = target as NetworkTransform;
-            void SetExpanded(bool expanded) { networkTransform.NetworkTransformExpanded = expanded; };
+            void SetExpanded(bool expanded)
+            {
+                networkTransform.NetworkTransformExpanded = expanded;
+            }
+
             DrawFoldOutGroup<NetworkTransform>(networkTransform.GetType(), DisplayNetworkTransformProperties, networkTransform.NetworkTransformExpanded, SetExpanded);
             base.OnInspectorGUI();
         }

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

@@ -709,7 +709,7 @@ protected virtual bool OnIsServerAuthoritative()
         private static byte[] s_EmptyArray = new byte[] { };
         private List<int> m_ParametersToUpdate;
         private RpcParams m_RpcParams;
-        private RpcTargetGroup m_TargetGroup;
+        private IGroupRpcTarget m_TargetGroup;
         private AnimationMessage m_AnimationMessage;
         private NetworkAnimatorStateChangeHandler m_NetworkAnimatorStateChangeHandler;
 
@@ -754,18 +754,15 @@ static AnimationParamEnumWrapper()
         /// </summary>
         private void SpawnCleanup()
         {
-            if (m_NetworkAnimatorStateChangeHandler != null)
-            {
-                m_NetworkAnimatorStateChangeHandler.DeregisterUpdate();
-                m_NetworkAnimatorStateChangeHandler = null;
-            }
+            m_NetworkAnimatorStateChangeHandler?.DeregisterUpdate();
+            m_NetworkAnimatorStateChangeHandler = null;
         }
 
         public override void OnDestroy()
         {
             SpawnCleanup();
 
-            m_TargetGroup?.Dispose();
+            m_TargetGroup?.Target?.Dispose();
 
             if (m_CachedAnimatorParameters != null && m_CachedAnimatorParameters.IsCreated)
             {
@@ -931,12 +928,12 @@ public override void OnNetworkSpawn()
                 NetworkLog.LogWarningServer($"[{gameObject.name}][{nameof(NetworkAnimator)}] {nameof(Animator)} is not assigned! Animation synchronization will not work for this instance!");
             }
 
-            m_TargetGroup = RpcTarget.Group(new List<ulong>(128), RpcTargetUse.Persistent) as RpcTargetGroup;
+            m_TargetGroup = RpcTarget.Group(new List<ulong>(128), RpcTargetUse.Persistent) as IGroupRpcTarget;
             m_RpcParams = new RpcParams()
             {
                 Send = new RpcSendParams()
                 {
-                    Target = m_TargetGroup
+                    Target = m_TargetGroup?.Target
                 }
             };
 
@@ -1222,7 +1219,7 @@ internal void CheckForAnimatorChanges()
                         }
                         m_TargetGroup.Add(clientId);
                     }
-                    m_RpcParams.Send.Target = m_TargetGroup;
+                    m_RpcParams.Send.Target = m_TargetGroup.Target;
                     SendClientAnimStateRpc(m_AnimationMessage, m_RpcParams);
                 }
             }
@@ -1558,7 +1555,7 @@ private unsafe void SendServerParametersUpdateRpc(ParametersUpdateMessage parame
                     m_TargetGroup.Add(clientId);
                 }
 
-                m_RpcParams.Send.Target = m_TargetGroup;
+                m_RpcParams.Send.Target = m_TargetGroup.Target;
                 m_NetworkAnimatorStateChangeHandler.SendParameterUpdate(parametersUpdate, m_RpcParams);
             }
         }
@@ -1624,7 +1621,7 @@ private void SendServerAnimStateRpc(AnimationMessage animationMessage, RpcParams
                     }
                     m_TargetGroup.Add(clientId);
                 }
-                m_RpcParams.Send.Target = m_TargetGroup;
+                m_RpcParams.Send.Target = m_TargetGroup.Target;
                 m_NetworkAnimatorStateChangeHandler.SendAnimationUpdate(animationMessage, m_RpcParams);
             }
         }

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

@@ -38,7 +38,7 @@ public interface IContactEventHandler
         /// <summary>
         /// Should return a <see cref="Rigidbody"/>.
         /// </summary>
-        Rigidbody GetRigidbody();
+        public Rigidbody GetRigidbody();
 
         /// <summary>
         /// Invoked by the <see cref="RigidbodyContactEventManager"/> instance.
@@ -49,7 +49,7 @@ public interface IContactEventHandler
         /// <param name="contactPoint">The world space location of the contact event.</param>
         /// <param name="hasCollisionStay">Will be set if this is a collision stay contact event (i.e. it is not the first contact event and continually has contact)</param>
         /// <param name="averagedCollisionStayNormal">The average normal of the collision stay contact over time.</param>
-        void ContactEvent(ulong eventId, Vector3 averagedCollisionNormal, Rigidbody collidingBody, Vector3 contactPoint, bool hasCollisionStay = false, Vector3 averagedCollisionStayNormal = default);
+        public void ContactEvent(ulong eventId, Vector3 averagedCollisionNormal, Rigidbody collidingBody, Vector3 contactPoint, bool hasCollisionStay = false, Vector3 averagedCollisionStayNormal = default);
     }
 
     /// <summary>
@@ -62,7 +62,7 @@ public interface IContactEventHandlerWithInfo : IContactEventHandler
         /// Invoked by <see cref="RigidbodyContactEventManager"/> for each set of contact events it is processing (prior to processing).
         /// </summary>
         /// <returns><see cref="ContactEventHandlerInfo"/></returns>
-        ContactEventHandlerInfo GetContactEventHandlerInfo();
+        public ContactEventHandlerInfo GetContactEventHandlerInfo();
     }
 
     /// <summary>

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

@@ -1623,12 +1623,8 @@ internal void ShutdownInternal()
 
             // Shutdown connection manager last which shuts down transport
             ConnectionManager.Shutdown();
-
-            if (MessageManager != null)
-            {
-                MessageManager.Dispose();
-                MessageManager = null;
-            }
+            MessageManager?.Dispose();
+            MessageManager = null;
 
             // Let the NetworkSceneManager clean up its two SceneEvenData instances
             SceneManager?.Dispose();
@@ -1745,9 +1741,9 @@ private void OnDestroy()
         /// </summary>
         internal interface INetworkManagerHelper
         {
-            bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false);
+            public bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false);
 
-            void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false);
+            public void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false);
 
             internal NetcodeAnalytics Analytics();
         }

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

@@ -508,7 +508,8 @@ public void DeferDespawn(int tickOffset, bool destroy = true)
         /// In order for this status to be applied, the the <see cref="NetworkObject"/> must have the <see cref="OwnershipStatus.RequestRequired"/>
         /// flag set and a non-owner client must have sent a request via <see cref="RequestOwnership"/>.
         /// </summary>
-        public bool IsRequestInProgress => ((OwnershipStatusExtended)Ownership).HasFlag(OwnershipStatusExtended.Requested);
+        public bool IsRequestInProgress =>
+            ((OwnershipStatusExtended)Ownership).HasFlag(OwnershipStatusExtended.Requested);
 
         /// <summary>
         /// Determines whether a NetworkObject can be distributed to other clients during
@@ -2852,18 +2853,54 @@ internal struct SerializedObject
             internal ushort GetBitsetRepresentation()
             {
                 ushort bitset = 0;
-                if (IsPlayerObject) { bitset |= k_IsPlayerObject; };
-                if (HasParent) { bitset |= k_HasParent; };
-                if (IsSceneObject) { bitset |= k_IsSceneObject; };
-                if (HasTransform) { bitset |= k_HasTransform; };
-                if (IsLatestParentSet) { bitset |= k_IsLatestParentSet; };
-                if (WorldPositionStays) { bitset |= k_WorldPositionStays; };
-                if (DestroyWithScene) { bitset |= k_DestroyWithScene; };
-                if (DontDestroyWithOwner) { bitset |= k_DontDestroyWithOwner; };
-                if (HasOwnershipFlags) { bitset |= k_HasOwnershipFlags; };
-                if (SyncObservers) { bitset |= k_SyncObservers; };
-                if (SpawnWithObservers) { bitset |= k_SpawnWithObservers; };
-                if (HasInstantiationData) { bitset |= k_HasInstantiationData; };
+                if (IsPlayerObject)
+                {
+                    bitset |= k_IsPlayerObject;
+                }
+                if (HasParent)
+                {
+                    bitset |= k_HasParent;
+                }
+                if (IsSceneObject)
+                {
+                    bitset |= k_IsSceneObject;
+                }
+                if (HasTransform)
+                {
+                    bitset |= k_HasTransform;
+                }
+                if (IsLatestParentSet)
+                {
+                    bitset |= k_IsLatestParentSet;
+                }
+                if (WorldPositionStays)
+                {
+                    bitset |= k_WorldPositionStays;
+                }
+                if (DestroyWithScene)
+                {
+                    bitset |= k_DestroyWithScene;
+                }
+                if (DontDestroyWithOwner)
+                {
+                    bitset |= k_DontDestroyWithOwner;
+                }
+                if (HasOwnershipFlags)
+                {
+                    bitset |= k_HasOwnershipFlags;
+                }
+                if (SyncObservers)
+                {
+                    bitset |= k_SyncObservers;
+                }
+                if (SpawnWithObservers)
+                {
+                    bitset |= k_SpawnWithObservers;
+                }
+                if (HasInstantiationData)
+                {
+                    bitset |= k_HasInstantiationData;
+                }
                 return bitset;
             }
 

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

@@ -15,7 +15,7 @@ public interface INetworkUpdateSystem
         /// The update method that is being executed in the context of related <see cref="NetworkUpdateStage"/>.
         /// </summary>
         /// <param name="updateStage">The <see cref="NetworkUpdateStage"/> that is being executed.</param>
-        void NetworkUpdate(NetworkUpdateStage updateStage);
+        public void NetworkUpdate(NetworkUpdateStage updateStage);
     }
 
     /// <summary>