4.5.4

- Fixed NetworkObject.OnDestroy not completing due to the object thinking it was not initialized (#803).
- Added scene validity check to method AddConnectionToScene (#805).

Author: FirstGearGames

Assets/FishNet/Runtime/Managing/Client/Object/ClientObjects.cs

@@ -236,7 +236,7 @@ private void RegisterAndDespawnSceneObjects(Scene s)
 
                 //Only set initialized values if not server, as server would have already done so.
                 if (!isServerStarted)
-                    nob.SetInitializedValues(parentNob: null);
+                    nob.SetInitializedValues(parentNob: null, force: false);
 
                 if (nob.GetIsNetworked())
                 {

Assets/FishNet/Runtime/Managing/NetworkManager.cs

@@ -212,7 +212,7 @@ public static IReadOnlyList<NetworkManager> Instances
         /// <summary>
         /// Version of this release.
         /// </summary>
-        public const string FISHNET_VERSION = "4.5.3";
+        public const string FISHNET_VERSION = "4.5.4";
         /// <summary>
         /// Maximum framerate allowed.
         /// </summary>

Assets/FishNet/Runtime/Managing/Object/ManagedObjects.cs

@@ -253,7 +253,7 @@ public static void InitializePrefab(NetworkObject prefab, int index, ushort? col
             if (collectionId != null)
                 prefab.SpawnableCollectionId = collectionId.Value;
 
-            prefab.SetInitializedValues(null);
+            prefab.SetInitializedValues(null, force: true);
         }
 
         /// <summary>

Assets/FishNet/Runtime/Managing/Scened/SceneManager.cs

@@ -1719,6 +1719,11 @@ public void AddConnectionToScene(NetworkConnection conn, Scene scene)
         {
             if (!conn.IsValid())
                 return;
+            if (!scene.isLoaded || !scene.IsValid())
+            {
+                NetworkManager.LogError($"Only valid, loaded scenes may be used.");
+                return;
+            }
 
             HashSet<NetworkConnection> hs;
             //Scene doesn't have any connections yet.

Assets/FishNet/Runtime/Managing/Server/Object/ServerObjects.cs

@@ -377,7 +377,7 @@ private void InitializeRootNetworkObjects(List<NetworkObject> nobs)
             foreach (NetworkObject nob in nobs)
             {
                 if (nob.IsSceneObject && !nob.IsNested)
-                    nob.SetInitializedValues(parentNob: null);
+                    nob.SetInitializedValues(parentNob: null, force: false);
             }
         }
 

Assets/FishNet/Runtime/Object/NetworkObject.cs

@@ -322,7 +322,7 @@ public void SetDefaultDespawnType(DespawnType despawnType)
         /// <summary>
         /// Becomes true once initialized values are set.
         /// </summary>
-        [System.NonSerialized]
+        [SerializeField, HideInInspector]
         private bool _initializedValusSet;
         #endregion
 
@@ -363,7 +363,7 @@ protected virtual void Awake()
             /* If networkBehaviours are not yet initialized then do so now.
              * After initializing at least 1 networkBehaviour will always exist
              * as emptyNetworkBehaviour is added automatically when none are present. */
-            if (NetworkBehaviours == null || NetworkBehaviours.Count == 0)
+            if (!_initializedValusSet)
             {
                 bool isNested = false;
                 //Make sure there are no networkObjects above this since initializing will trickle down.
@@ -381,7 +381,7 @@ protected virtual void Awake()
 
                 //If not nested then init
                 if (!isNested)
-                    SetInitializedValues(parentNob: null);
+                    SetInitializedValues(parentNob: null, force: false);
             }
 
             SetChildDespawnedState();
@@ -852,17 +852,17 @@ private bool IsInvalidParent(NetworkBehaviour nb)
         /// Sets values as they are during initialization, such as componentId, NetworkBehaviour Ids, and more.
         /// Starts with a 0 componentId.
         /// </summary>
-        internal void SetInitializedValues(NetworkObject parentNob)
+        internal void SetInitializedValues(NetworkObject parentNob, bool force = false)
         {
             byte componentId = 0;
-            SetInitializedValues(parentNob, ref componentId);
+            SetInitializedValues(parentNob, ref componentId, force);
         }
 
         /// <summary>
         /// Sets values as they are during initialization, such as componentId, NetworkBehaviour Ids, and more.
         /// </summary>
         /// <param name="componentId">ComponentId to start from for the NetworkObject.</param>
-        internal void SetInitializedValues(NetworkObject parentNob, ref byte componentId)
+        internal void SetInitializedValues(NetworkObject parentNob, ref byte componentId, bool force = false)
         {
             if (!ApplicationState.IsPlaying())
             {
@@ -872,7 +872,7 @@ internal void SetInitializedValues(NetworkObject parentNob, ref byte componentId
 
             /* If NetworkBehaviours is null then all collections are.
              * Set values for each collection. */
-            if (!_initializedValusSet)
+            if (force || !_initializedValusSet)
             {
                 /* This only runs when playing, so it's safe to return existing to the pool. */
                 StoreCollections();
@@ -1009,7 +1009,7 @@ internal void SetInitializedValues(NetworkObject parentNob, ref byte componentId
             foreach (NetworkObject item in InitializedNestedNetworkObjects)
             {
                 componentId++;
-                item.SetInitializedValues(this, ref componentId);
+                item.SetInitializedValues(this, ref componentId, force);
             }
 
             //Update global states to that of this one.

Assets/FishNet/Runtime/Object/Synchronizing/Beta/SyncList.cs

@@ -747,4 +747,4 @@ private void Set(int index, T value, bool asServer, bool force)
         IEnumerator IEnumerable.GetEnumerator() => Collection.GetEnumerator();
     }
 }
-#endif
+#endif

Assets/FishNet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.firstgeargames.fishnet",
-  "version": "4.5.3",
+  "version": "4.5.4",
   "displayName": "FishNet: Networking Evolved",
   "description": "A feature-rich Unity networking solution aimed towards reliability, ease of use, efficiency, and flexibility.",
   "unity": "2021.3",