update

Only assign the server or host world to NetCode.Netcode.Instance.m_ActiveWorld

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/UnifiedNetworkTransformTest.cs

@@ -47,7 +47,7 @@ protected override bool OnSetVerboseDebug()
         protected override IEnumerator OnSetup()
         {
             // Creates the hybrid prefab
-            m_Prefab = CreateHybridPrefab("HybridPrefab", true);
+            m_Prefab = CreateNetworkObjectPrefab("HybridPrefab");
             m_Prefab.AddComponent<DoNothingNetworkTransform>();
             return base.OnSetup();
         }

com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkListTests.cs

@@ -15,6 +15,8 @@ namespace Unity.Netcode.RuntimeTests
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Server)]
+    [TestFixture(HostOrServer.UnifiedHost)]
+    [TestFixture(HostOrServer.UnifiedServer)]
     internal class NetworkListTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 3;

com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTest.cs

@@ -2296,7 +2296,7 @@ protected GameObject CreateNetworkObjectPrefab(string baseName)
 #if UNIFIED_NETCODE
             if (m_AllPrefabsAsHybrid)
             {
-                return CreateHybridPrefab(baseName);
+                return CreateHybridPrefab(baseName, true);
             }
 #endif
             var prefabCreateAssertError = $"You can only invoke this method during {nameof(OnServerAndClientsCreated)} " +
@@ -2450,6 +2450,14 @@ internal void SpawnInstanceWithOwnership(NetworkObject networkObjectToSpawn, Net
             }
             else
             {
+#if UNIFIED_NETCODE
+                // TODO-FixMe: NetCode.Netcode.Instance is a singleton and might cause issues
+                // assigning this.
+                if (networkObjectToSpawn.HasGhost)
+                {
+                    NetCode.Netcode.Instance.m_ActiveWorld = m_ServerNetworkManager.NetcodeWorld;
+                }
+#endif
                 networkObjectToSpawn.NetworkManagerOwner = m_ServerNetworkManager; // Required to assure the server does the spawning
                 if (spawnAuthority == m_ServerNetworkManager)
                 {
@@ -2507,14 +2515,6 @@ protected void SpawnObjectInstance(NetworkObject networkObjectToSpawn, NetworkMa
         private GameObject SpawnObject(NetworkObject prefabNetworkObject, NetworkManager owner, bool destroyWithScene = false, bool isPlayerObject = false)
         {
             Assert.IsTrue(prefabNetworkObject.GlobalObjectIdHash > 0, $"{nameof(GameObject)} {prefabNetworkObject.name} has a {nameof(NetworkObject.GlobalObjectIdHash)} value of 0! Make sure to make it a valid prefab before trying to spawn!");
-#if UNIFIED_NETCODE
-            // TODO-FixMe: NetCode.Netcode.Instance is a singleton and might cause issues
-            // assigning this.
-            if (prefabNetworkObject.HasGhost)
-            {
-                NetCode.Netcode.Instance.m_ActiveWorld = owner.NetcodeWorld;
-            }
-#endif
             var newInstance = Object.Instantiate(prefabNetworkObject.gameObject);
             var networkObjectToSpawn = newInstance.GetComponent<NetworkObject>();
             SpawnObjectInstance(networkObjectToSpawn, owner, destroyWithScene, isPlayerObject);