chore: resolve v2.13.1 unified merge artifacts (#4104)

NoelStephensUnity · web-flow · commit 92d8bb92a1a0 · 2026-07-24T18:24:57.000-04:00
update

Resolving changes made to develop-2.0.0 and were missed in merge due to all of that script is defined out and we have not yet enabled the CI unified tests (which would have caught this).
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs
@@ -1104,7 +1104,7 @@ internal void SynchronizeSceneNetworkObjects(NetworkManager networkManager)
                     // information during synchronization.
                     if (serializedObject.HasGhost)
                     {
-                        if (networkManager.SpawnManager.GhostSpawnManager.ShouldDeferGhostSceneObject(serializedObject, InternalBuffer))
+                        if (networkManager.SpawnManager.GhostSpawnManager.ShouldDeferGhostSceneObject(serializedObject, m_InternalBuffer))
                         {
                             continue;
                         }
diff --git a/com.unity.netcode.gameobjects/Runtime/Spawning/GhostSpawnManager.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/GhostSpawnManager.cs
@@ -144,7 +144,7 @@ internal NetworkObject ProcessGhostPendingSynchronization(ulong networkObjectId,
             {
                 m_NetworkManager.SceneManager.SetTheSceneBeingSynchronized(serializedObject.NetworkSceneHandle);
             }
-            var networkObject = NetworkObject.Deserialize(serializedObject, reader, m_NetworkManager);
+            var networkObject = NetworkObject.DeserializeAndSpawnObject(serializedObject, reader, m_NetworkManager);
 
             // TODO-UNIFIED: How do we handle the "all in-scene placed objects are spawned notification"?
             //if (serializedObject.IsSceneObject)

Original file line number	Diff line number	Diff line change
`@@ -1104,7 +1104,7 @@ internal void SynchronizeSceneNetworkObjects(NetworkManager networkManager)`
`1104`	`1104`	`// information during synchronization.`
`1105`	`1105`	`if (serializedObject.HasGhost)`
`1106`	`1106`	`{`
`1107`		`- if (networkManager.SpawnManager.GhostSpawnManager.ShouldDeferGhostSceneObject(serializedObject, InternalBuffer))`
	`1107`	`+ if (networkManager.SpawnManager.GhostSpawnManager.ShouldDeferGhostSceneObject(serializedObject, m_InternalBuffer))`
`1108`	`1108`	`{`
`1109`	`1109`	`continue;`
`1110`	`1110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ internal NetworkObject ProcessGhostPendingSynchronization(ulong networkObjectId,`
`144`	`144`	`{`
`145`	`145`	`m_NetworkManager.SceneManager.SetTheSceneBeingSynchronized(serializedObject.NetworkSceneHandle);`
`146`	`146`	`}`
`147`		`- var networkObject = NetworkObject.Deserialize(serializedObject, reader, m_NetworkManager);`
	`147`	`+ var networkObject = NetworkObject.DeserializeAndSpawnObject(serializedObject, reader, m_NetworkManager);`
`148`	`148`
`149`	`149`	`// TODO-UNIFIED: How do we handle the "all in-scene placed objects are spawned notification"?`
`150`	`150`	`//if (serializedObject.IsSceneObject)`