update

Removing a hack work around that is no longer needed due to recent fixes merged in the dots repo side.

Author: NoelStephensUnity

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

@@ -348,11 +348,6 @@ public void NetworkUpdate(NetworkUpdateStage updateStage)
                         {
                             NetworkConfig.Prefabs.RegisterGhostPrefabs(this);
                         }
-
-                        if (!IsServer)
-                        {
-                            SpawnManager?.CheckGhostsPendingNetworkObjectId();
-                        }
 #endif
 
                         UpdateTopology();

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

@@ -3854,16 +3854,6 @@ private void InitGhost()
             }
         }
 
-        internal bool IsGhostNetworkObjectIdValid()
-        {
-            if (NetworkObjectBridge == null)
-            {
-                return false;
-            }
-            // TODO-UNIFIED: Sometimes the GhostField can be latent. Need a way to know the GhostField has been set.
-            return NetworkObjectBridge.NetworkObjectId.Value < 1000000;
-        }
-
         internal void RegisterGhostBridge()
         {
             if (NetworkManager.LogLevel == LogLevel.Developer)

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs

@@ -34,46 +34,13 @@ public class NetworkSpawnManager
 
         internal readonly Dictionary<ulong, NetworkObject> GhostsPendingSpawn = new Dictionary<ulong, NetworkObject>();
 
-        internal readonly List<NetworkObject> GhostsPendingNetworkObjectId = new List<NetworkObject>();
-
-        internal void CheckGhostsPendingNetworkObjectId()
-        {
-            if (GhostsPendingNetworkObjectId.Count == 0)
-            {
-                return;
-            }
-
-            for(int i = GhostsPendingNetworkObjectId.Count - 1; i >= 0; i--)
-            {
-                var networkObject = GhostsPendingNetworkObjectId[i];
-                if (networkObject.IsGhostNetworkObjectIdValid())
-                {
-                    GhostsPendingNetworkObjectId.Remove(networkObject);
-                    if (NetworkManager.LogLevel == LogLevel.Developer)
-                    {
-                        Debug.Log($"[{nameof(RegisterGhostPendingSpawn)}] {networkObject.name}'s Ghost {nameof(NetworkObject.NetworkObjectId)} is valid. Re-registering.");
-                    }
-                    networkObject.RegisterGhostBridge();
-                }
-            }
-        }
-
         internal void RegisterGhostPendingSpawn(NetworkObject networkObject, ulong networkObjectId)
         {
-            if (!networkObject.IsGhostNetworkObjectIdValid())
-            {
-                GhostsPendingNetworkObjectId.Add(networkObject);
-                if (NetworkManager.LogLevel == LogLevel.Developer)
-                {
-                    Debug.Log($"[{nameof(RegisterGhostPendingSpawn)}] {networkObject.name}'s Ghost {nameof(NetworkObject.NetworkObjectId)} ({networkObjectId}) seems invalid. Adding to the pending NetworkObjectId list.");
-                }
-                return;
-            }
             if (NetworkManager.LogLevel == LogLevel.Developer)
             {
                 Debug.Log($"[{nameof(RegisterGhostPendingSpawn)}] Registering {networkObject.name} with a {nameof(NetworkObject.NetworkObjectId)} of {networkObjectId}.");
             }
-            if(GhostsPendingSpawn.TryAdd(networkObjectId, networkObject))
+            if (GhostsPendingSpawn.TryAdd(networkObjectId, networkObject))
             {
                 // TODO-UNIFIED: We need a better way to preserve any hybrid instances pending NGO spawn.
                 // For now, move any pending object into the DDOL.
@@ -2041,8 +2008,6 @@ internal NetworkSpawnManager(NetworkManager networkManager)
         internal void Shutdown()
         {
 #if UNIFIED_NETCODE
-            GhostsPendingNetworkObjectId.Clear();
-            GhostsPendingNetworkObjectId.Clear();
             GhostsPendingSpawn.Clear();
             GhostsPendingSynchronization.Clear();
 #endif