fix: reset static fields for Fast Enter Play Mode by noellie-velez · Pull Request #3956 · Unity-Technologies/com.unity.netcode.gameobjects

noellie-velez · 2026-04-24T13:34:30Z

Purpose of this PR

Ensure com.unity.netcode.gameobjects package supports Fast Enter Play Mode

Jira ticket

MTT-14665

Changelog

Fixed: Netcode for Game Objects now supports Fast Enter Play Mode

Documentation

No documentation changes or additions were necessary.

Testing & QA (How your changes can be verified during release Playtest)

Functional Testing

Manual testing :

Manual testing done

Automated tests:

Covered by existing automated tests
Covered by new automated tests

Does the change require QA team to:

Review automated tests?
Execute manual tests?
Provide feedback about the PR?

If any boxes above are checked the QA team will be automatically added as a PR reviewer.

Backports

N/A

# Conflicts: # com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

noellie-velez · 2026-04-24T14:36:32Z

        }

-        internal static bool LogSerializationOrder = false;
+        internal static bool LogSerializationOrder;


This is only used to perform some logging but it is never set to true and it is internal, should we keep it? Is this something that should go in the new logging system instead?

If you can figure out a way to handle it via the new logging system that would be great.
Otherwise, you could get rid of the static and just wrap that code in a define (i.e. LOG_SERIALIZATION_ORDER or the like).

Let's just move this setting into NetworkLog.Config We can change the log logic later

noellie-velez · 2026-04-24T15:06:12Z

When is m_ParentedChildren updated? I had a warning about this in my IDE and didn't find the info myself 🫠

Yeah... that was evidently a legacy merge issue that kept the old way of handling this.
As an example:

// Synchronize any nested NetworkTransforms with the parent's <<---- The new "correct" way foreach (var childNetworkTransform in NetworkObject.NetworkTransforms) { // Don't update the same instance or any nested NetworkTransform with a different authority mode if (childNetworkTransform == this || childNetworkTransform.AuthorityMode != AuthorityMode) { continue; } if (childNetworkTransform.CanCommitToTransform) { childNetworkTransform.OnNetworkTick(true); } } // Synchronize any parented children with the parent's motion <<---- The legacy "old way" (remove) foreach (var child in m_ParentedChildren) { // Synchronize any nested NetworkTransforms of the child with the parent's foreach (var childNetworkTransform in child.NetworkTransforms) { if (childNetworkTransform.CanCommitToTransform) { childNetworkTransform.OnNetworkTick(true); } } }

Everywhere you see m_ParentedChildren (merge artifact) there is going to be a duplicate for loop using NetworkObject.NetworkTransforms (correct).

simon-lemay-unity

Changes to UnityTransport look good to me.

# Conflicts: # com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs

noellie-velez · 2026-05-11T14:55:18Z

+
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void ResetStaticsOnLoad()


Move this at the top

noellie-velez · 2026-05-11T14:57:20Z

@@ -44,6 +44,10 @@ public static class QuaternionCompressor

        // Used to store the absolute value of the 4 quaternion elements
        private static Quaternion s_QuatAbsValues = Quaternion.identity;


Replace quaternion by 4 ints

noellie-velez · 2026-05-11T15:28:21Z

+#if UNITY_EDITOR
+using UnityEngine;
+#endif


Remove this, add UnityEngine.Runtime...

noellie-velez · 2026-05-11T15:29:07Z

        internal delegate void ResetNetworkManagerDelegate(NetworkManager manager);

        internal static ResetNetworkManagerDelegate OnNetworkManagerReset;
+        //We already are in an #if UNITY_ENGINE def


Remove this comment

noellie-velez · 2026-05-11T15:40:39Z

+            DisableNotOptimizedSerializedType = false;
+        }

        private void Reset()


Add xml doc with:
Used by cref... NetworkManagerHeper this is called by the reset button of the Unity Editor

noellie-velez · 2026-05-11T15:42:30Z

        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
        private static void Initialize()
        {
+#if UNITY_EDITOR


add comment //Reset Statics

noellie-velez · 2026-05-11T15:43:01Z

 using System.Collections.Generic;
 using Unity.Collections;
+#if UNITY_EDITOR
+using UnityEngine;


Move it down to use UnityEngine.Runtime...

noellie-velez · 2026-05-11T15:46:32Z

@@ -1,3 +1,6 @@
+#if UNITY_6000_6_OR_NEWER
+using Unity.Scripting.LifecycleManagement;


Add it down Unity.Scripting.LifecycleManagement.Auto...

noellie-velez · 2026-05-11T15:54:13Z

+                s_SceneEventTypeNames[(uint)type] = type.ToString();
+            }
+            s_FrameDispatch = new ProfilerMarker($"{nameof(NetworkMetrics)}.DispatchFrame");
+        }


Remove this reset, not needed here

noellie-velez · 2026-05-11T15:54:28Z

@@ -13,6 +16,18 @@ internal class NetworkMetrics : INetworkMetrics
        private const ulong k_MaxMetricsPerFrame = 1000L;
        private static Dictionary<uint, string> s_SceneEventTypeNames;


this can be made readonly

noellie-velez · 2026-05-11T15:56:59Z

 using Unity.Collections.LowLevel.Unsafe;
 using Unity.Mathematics;
+#if UNITY_6000_6_OR_NEWER
+using Unity.Scripting.LifecycleManagement;


Put this with AutoStaticsCleanup

noellie-velez · 2026-05-11T15:57:20Z

@@ -1,4 +1,7 @@
 using System;
+#if UNITY_6000_6_OR_NEWER
+using Unity.Scripting.LifecycleManagement;


noellie-velez · 2026-05-11T15:58:02Z

    public static class NetworkVariableSerializationTypedInitializers
    {
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]


Do not change this one

noellie-velez · 2026-05-11T15:59:21Z

        internal static bool IgnoreInitializeWarning;
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void ResetStaticsOnLoad() => IgnoreInitializeWarning = false;


The test lifecycle cleans itself up, we can remove this one

EmandM · 2026-05-11T16:03:19Z

+#if UNITY_EDITOR
+            internal static void ResetInstances() => s_Instances = new Dictionary<NetworkManager, List<SceneUnloadEventHandler>>();
+#endif


Because we're not using the attribute, a conditional define works here

Suggested change

#if UNITY_EDITOR

internal static void ResetInstances() => s_Instances = new Dictionary<NetworkManager, List<SceneUnloadEventHandler>>();

#endif

[Conditional("UNITY_EDITOR")]

internal static void ResetInstances() => s_Instances = new Dictionary<NetworkManager, List<SceneUnloadEventHandler>>();

noellie-velez · 2026-05-11T16:11:48Z

@@ -636,7 +641,7 @@ internal void WriteSceneSynchronizationData(FastBufferWriter writer)
            }
            if (EnableSerializationLogs)


Move this one too to the NetworkLog LogConfiguration struct

Add a code comment showing where it is used

noellie-velez added 4 commits April 24, 2026 15:17

fix: reset static fields for Fast Enter Play Mode

c6f0d4b

Remove RuntimeInitializeOnLoadMethod from non generic types

702bb73

Fix naming + if editor def on using UnityEngine

8dabded

Merge branch 'develop-2.0.0' into chore/fast-enter-playmode

aa33ed6

# Conflicts: # com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

noellie-velez commented Apr 24, 2026

View reviewed changes

Styling, renaming and made a field readonly

5ab98dc

noellie-velez commented Apr 24, 2026

View reviewed changes

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

noellie-velez commented Apr 24, 2026

View reviewed changes

noellie-velez marked this pull request as ready for review April 24, 2026 15:06

noellie-velez requested review from a team as code owners April 24, 2026 15:06

simon-lemay-unity approved these changes Apr 24, 2026

View reviewed changes

noellie-velez and others added 7 commits April 28, 2026 14:21

Merge branch 'develop-2.0.0' into chore/fast-enter-playmode

69dce92

# Conflicts: # com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs

Fix code formatting issues (redundant UnityEngine)

638855f

Merge branch 'develop-2.0.0' into chore/fast-enter-playmode

4cbec9b

Add AutoStaticsCleanup + fix typo

0ecf34c

Remove possible NullReferenceException

e65351c

Unused parented children list cleanup

551b989

Merge branch 'develop-2.0.0' into chore/fast-enter-playmode

689ecd2

noellie-velez commented May 11, 2026

View reviewed changes

EmandM reviewed May 11, 2026

View reviewed changes

noellie-velez commented May 11, 2026

View reviewed changes

		@@ -44,6 +44,10 @@ public static class QuaternionCompressor

		// Used to store the absolute value of the 4 quaternion elements
		private static Quaternion s_QuatAbsValues = Quaternion.identity;

		@@ -1,3 +1,6 @@
		#if UNITY_6000_6_OR_NEWER
		using Unity.Scripting.LifecycleManagement;

		@@ -13,6 +16,18 @@ internal class NetworkMetrics : INetworkMetrics
		private const ulong k_MaxMetricsPerFrame = 1000L;
		private static Dictionary<uint, string> s_SceneEventTypeNames;

		@@ -636,7 +641,7 @@ internal void WriteSceneSynchronizationData(FastBufferWriter writer)
		}
		if (EnableSerializationLogs)

Conversation

noellie-velez commented Apr 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose of this PR

Jira ticket

Changelog

Documentation

Testing & QA (How your changes can be verified during release Playtest)

Functional Testing

Backports

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

simon-lemay-unity left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

noellie-velez May 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

noellie-velez commented Apr 24, 2026 •

edited

Loading

noellie-velez May 11, 2026 •

edited

Loading