update

Applying changes based on review discussion.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs

@@ -768,10 +768,7 @@ protected virtual void Awake()
             if (!m_Animator)
             {
 #if !UNITY_EDITOR
-                if (!m_Animator)
-                {
-                    Debug.LogWarning($"{nameof(NetworkAnimator)} {name} does not have an {nameof(UnityEngine.Animator)} assigned to it. The {nameof(NetworkAnimator)} will not initialize properly.");
-                }
+                Debug.LogWarning($"{nameof(NetworkAnimator)} {name} does not have an {nameof(UnityEngine.Animator)} assigned to it. The {nameof(NetworkAnimator)} will not initialize properly.");
 #endif
                 return;
             }

com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabs.cs

@@ -47,7 +47,34 @@ public class NetworkPrefabs
         [NonSerialized]
         private List<NetworkPrefab> m_Prefabs = new List<NetworkPrefab>();
 
-        internal List<NetworkPrefab> InternalPrefabs => m_Prefabs;
+        /// <summary>
+        /// Returns the last registered prefab.
+        /// </summary>
+        internal NetworkPrefab GetLastRegisteredPrefab()
+        {
+            if (m_Prefabs.Count == 0)
+            {
+                return null;
+            }
+            return m_Prefabs[m_Prefabs.Count - 1];
+        }
+
+        /// <summary>
+        /// Applies a network prefab at a specific index
+        /// </summary>
+        /// <param name="index">index to apply</param>
+        /// <param name="networkPrefab">network prefab to be applied</param>
+        /// <returns></returns>
+        internal bool AssignPrefabAtIndex(int index, NetworkPrefab networkPrefab)
+        {
+            if (index >= m_Prefabs.Count)
+            {
+                NetworkManager.Singleton.Log.Error(new Logging.Context(LogLevel.Normal, $"[{nameof(NetworkPrefabs)}][{nameof(AssignPrefabAtIndex)}] Cannot apply prefab to index {index} when the {nameof(m_Prefabs)} count is only {m_Prefabs.Count}!"));
+                return false;
+            }
+            m_Prefabs[index] = networkPrefab;
+            return true;
+        }
 
         [NonSerialized]
         private Dictionary<uint, NetworkPrefab> m_PrefabHashIds = new Dictionary<uint, NetworkPrefab>();

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

@@ -350,10 +350,22 @@ private void CheckForInScenePlaced()
 
                 // Default scene migration synchronization to false for in-scene placed NetworkObjects
                 SceneMigrationSynchronization = false;
+
+                // Set our disabled in-scene placed flag for spawning initially disabled in-scene placed objects.
+                m_InScenePlacedDisabledByDefault = gameObject.activeInHierarchy;
             }
         }
 #endif // UNITY_EDITOR
 
+        /// <summary>
+        /// Used to provide support for initially disabled in-scene placed objects.
+        /// This is only ever set on in-scene placed objects that are already disabled
+        /// in the scene asset itself.
+        /// </summary>
+        [HideInInspector]
+        [SerializeField]
+        private bool m_InScenePlacedDisabledByDefault;
+
         /// <summary>
         /// Gets the NetworkManager that owns this NetworkObject instance
         /// </summary>
@@ -1887,8 +1899,8 @@ private void SpawnInternal(bool destroyWithScene, ulong ownerClientId, bool play
             // Trap for runtime generated instances as this is not valid
             if (GlobalObjectIdHash == 0)
             {
-                NetworkManager.Log.ErrorServer(new Context(LogLevel.Error, $"{name} has a {nameof(GlobalObjectIdHash)} value of {GlobalObjectIdHash}(zero)!" +
-                    $"This is typically a sign of runtime generated {nameof(NetworkObject)}s which is not supported."));
+                NetworkManager.Log.ErrorServer(new Context(LogLevel.Error, $"Detected {nameof(NetworkObject)} {nameof(GlobalObjectIdHash)} value of 0!" +
+                    $"This is typically a sign of runtime generated network prefab assets which are not supported.").AddNetworkObject(this));
                 return;
             }
 
@@ -1904,7 +1916,7 @@ private void SpawnInternal(bool destroyWithScene, ulong ownerClientId, bool play
             // If we are marked as in-scene place, have never been spawned, and the root GameObject
             // was not disabled upon being instantiated, then treat this as a dynamically spawned
             // instance.
-            if (InScenePlaced && !m_GameObjectWasDisabledWhenInstantiated && !HasBeenSpawned)
+            if (InScenePlaced && !m_InScenePlacedDisabledByDefault && !HasBeenSpawned)
             {
                 if (NetworkManagerOwner.NetworkConfig.EnableSceneManagement && NetworkManagerOwner.LogLevel <= LogLevel.Developer)
                 {
@@ -3717,13 +3729,13 @@ internal void SceneChangedUpdate(Scene scene, bool notify = false)
             }
         }
 
-        private bool m_GameObjectWasDisabledWhenInstantiated;
+        
 
         private void Awake()
         {
             SetCachedParent(transform.parent);
             SceneOrigin = gameObject.scene;
-            m_GameObjectWasDisabledWhenInstantiated = gameObject.activeInHierarchy;
+            m_GameObjectWasDisabledWhenInstantiated = true;
         }
 
         /// <summary>

com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerTests.cs

@@ -79,20 +79,20 @@ public IEnumerator NetworkConfigInvalidNetworkPrefabTest()
             // This would be the scenario that a hash would be used (typically when scene management is disabled)
             validPrefabForSourceHash.InScenePlaced = true;
 
-            var networkPrefab = authority.NetworkConfig.Prefabs.InternalPrefabs[authority.NetworkConfig.Prefabs.InternalPrefabs.Count - 1];
+            var networkPrefab = authority.NetworkConfig.Prefabs.GetLastRegisteredPrefab();
             networkPrefab.SourceHashToOverride = validPrefabForSourceHash.GlobalObjectIdHash;
             networkPrefab.OverridingTargetPrefab = validPrefabAsset.gameObject;
             networkPrefab.Override = NetworkPrefabOverride.Hash;
-            authority.NetworkConfig.Prefabs.InternalPrefabs[authority.NetworkConfig.Prefabs.InternalPrefabs.Count - 1] = networkPrefab;
+            Assert.True(authority.NetworkConfig.Prefabs.AssignPrefabAtIndex(authority.NetworkConfig.Prefabs.Prefabs.Count - 1, networkPrefab), $"Failed to assign network prefab!");
 
             var sourcePrefab = MakeValidNetworkPrefab();
-            networkPrefab = authority.NetworkConfig.Prefabs.InternalPrefabs[authority.NetworkConfig.Prefabs.InternalPrefabs.Count - 1];
+            networkPrefab = authority.NetworkConfig.Prefabs.GetLastRegisteredPrefab();
             var index = authority.NetworkConfig.Prefabs.Prefabs.Count - 1;
             var targetPrefab = MakeValidNetworkPrefab();
             networkPrefab.Prefab = sourcePrefab;
             networkPrefab.SourcePrefabToOverride = sourcePrefab;
             networkPrefab.OverridingTargetPrefab = targetPrefab;
-            authority.NetworkConfig.Prefabs.InternalPrefabs[index] = networkPrefab;
+            Assert.True(authority.NetworkConfig.Prefabs.AssignPrefabAtIndex(index, networkPrefab), $"Failed to assign network prefab!");
 
             m_CanStart = true;
             yield return StartServerAndClients();
@@ -101,8 +101,6 @@ public IEnumerator NetworkConfigInvalidNetworkPrefabTest()
             Assert.AreEqual(5, authority.NetworkConfig.Prefabs.NetworkPrefabOverrideLinks.Count);
         }
 
-        private const string k_PrefabObjectName = "NetworkPrefabHandlerTestObject";
-
 
         [UnityTest]
         public IEnumerator NetworkPrefabHandlerClass([Values] NetworkTopologyTypes topologyType)