From 981ad0c6e573ec94d953144f73f44853bb5ec165 Mon Sep 17 00:00:00 2001
From: Noel Stephens <noel.stephens@unity3d.com>
Date: Mon, 27 Jul 2026 21:23:32 -0500
Subject: [PATCH 1/2] update

Removing the work around method as setting GhostField<T>.Value after instantiating works now.
---
 .../Runtime/Components/Helpers/NetworkObjectBridge.cs        | 5 -----
 .../Runtime/Spawning/NetworkSpawnManager.cs                  | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs b/com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs
index 9806c58eb1..3dbd430337 100644
--- a/com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs
@@ -61,11 +61,6 @@ private void OnValidate()
         /// N4E-spawned hybrid prefab instances.
         /// </summary>
         internal GhostField<ulong> NetworkObjectId = new GhostField<ulong>();
-        public void SetNetworkObjectId(ulong networkObjectId)
-        {
-            NetworkObjectId.PresetValue(networkObjectId);
-            NetworkObjectId.Value = networkObjectId;
-        }
 
         /// <summary>
         /// Currently, NGO provides the parenting event handling via <see cref="ParentSyncMessage"/>.
diff --git a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs
index 0a45243cc4..2cf076e1db 100644
--- a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs
@@ -1176,7 +1176,7 @@ internal bool AuthorityLocalSpawn([NotNull] NetworkObject networkObject, ulong n
             // the NetworkObject is fully spawned.
             if (networkObject.HasGhost)
             {
-                networkObject.NetworkObjectBridge.SetNetworkObjectId(networkObject.NetworkObjectId);
+                networkObject.NetworkObjectBridge.NetworkObjectId.Value = networkObject.NetworkObjectId;
             }
 #endif
 

From e72324cb3b8c5a3946e50d32f6787296fb2bef7e Mon Sep 17 00:00:00 2001
From: Noel Stephens <noel.stephens@unity3d.com>
Date: Mon, 27 Jul 2026 21:30:34 -0500
Subject: [PATCH 2/2] update

Adjusting for suggested change in execution order.
---
 .../Runtime/Components/Helpers/NetworkObjectBridge.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs b/com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs
index 3dbd430337..69eb729d9a 100644
--- a/com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs
@@ -11,7 +11,7 @@ namespace Unity.Netcode
     /// specific to the N4E-spawned hybrid prefab instance that has the matching <see cref="NetworkObjectId"/>.
     /// </summary>
 
-    [DefaultExecutionOrder(GhostObjectExecutionOrder.ExecutionOrder + 1)]
+    [DefaultExecutionOrder(GhostObject.ExecutionOrder + 1)]
     //BREAK --- Fix this on UNIFIED side 1st
     public partial class NetworkObjectBridge : GhostBehaviour
     {