4.6.17R

- Fixed ObjectCache collections not being initialized due to multi-threading support for Unity 6+.

Author: FirstGearGames

Assets/FishNet/Runtime/Managing/NetworkManager.cs

@@ -232,7 +232,7 @@ internal void SetBroadcastName<T>(ushort key) where T : struct, IBroadcast
         /// <summary>
         /// Version of this release.
         /// </summary>
-        public const string FISHNET_VERSION = "4.6.16";
+        public const string FISHNET_VERSION = "4.6.17";
         /// <summary>
         /// Maximum framerate allowed.
         /// </summary>

Assets/FishNet/Runtime/Plugins/GameKit/Dependencies/Utilities/ObjectCaching.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using GameKit.Dependencies.Utilities.Types;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
@@ -155,18 +156,12 @@ public static void Store(Dictionary<T1, T2> value)
         /// <summary>
         /// Cache for ResettableRingBuffer.
         /// </summary>
-        [ThreadStatic]
-        private static readonly Stack<ResettableRingBuffer<T>> _resettableRingBufferCache;
+        private static readonly ConcurrentStack<ResettableRingBuffer<T>> _resettableRingBufferCache = new();
         /// <summary>
         /// Maximum number of entries allowed for the cache.
         /// </summary>
         private const int MAXIMUM_CACHE_COUNT = 50;
-
-        static ResettableCollectionCaches()
-        {
-            _resettableRingBufferCache = new();
-        }
-
+        
         /// <summary>
         /// Retrieves a collection.
         /// </summary>
@@ -465,18 +460,12 @@ public static class CollectionCaches<T1, T2>
         /// <summary>
         /// Cache for dictionaries.
         /// </summary>
-        [ThreadStatic]
-        private static readonly Stack<Dictionary<T1, T2>> _dictionaryCache;
+        private static readonly ConcurrentStack<Dictionary<T1, T2>> _dictionaryCache = new();
         /// <summary>
         /// Maximum number of entries allowed for the cache.
         /// </summary>
         private const int MAXIMUM_CACHE_COUNT = 50;
 
-        static CollectionCaches()
-        {
-            _dictionaryCache = new();
-        }
-
         /// <summary>
         /// Retrieves a collection.
         /// </summary>
@@ -525,33 +514,27 @@ public static class CollectionCaches<T>
         /// <summary>
         /// Cache for arrays.
         /// </summary>
-        [ThreadStatic]
-        private static readonly Stack<T[]> _arrayCache;
+        private static readonly ConcurrentStack<T[]> _arrayCache = new();
         /// <summary>
         /// Cache for lists.
         /// </summary>
-        [ThreadStatic]
-        private static readonly Stack<List<T>> _listCache;
+        private static readonly ConcurrentStack<List<T>> _listCache = new();
         /// <summary>
         /// Cache for sortedset.
         /// </summary>
-        [ThreadStatic]
-        private static readonly Stack<SortedSet<T>> _sortedSetCache;
+        private static readonly ConcurrentStack<SortedSet<T>> _sortedSetCache = new();
         /// <summary>
         /// Cache for queues.
         /// </summary>
-        [ThreadStatic]
-        private static readonly Stack<Queue<T>> _queueCache;
+        private static readonly ConcurrentStack<Queue<T>> _queueCache = new();
         /// <summary>
         /// Cache for queues.
         /// </summary>
-        [ThreadStatic]
-        private static readonly Stack<BasicQueue<T>> _basicQueueCache;
+        private static readonly ConcurrentStack<BasicQueue<T>> _basicQueueCache = new();
         /// <summary>
         /// Cache for hashset.
         /// </summary>
-        [ThreadStatic]
-        private static readonly Stack<HashSet<T>> _hashSetCache;
+        private static readonly ConcurrentStack<HashSet<T>> _hashSetCache = new();
         /// <summary>
         /// Maximum number of entries allowed for the cache.
         /// </summary>
@@ -861,18 +844,12 @@ public static void Store(HashSet<T> value)
         /// <summary>
         /// Stack to use.
         /// </summary>
-        [ThreadStatic]
-        private static readonly Stack<T> _stack;
+        private static readonly ConcurrentStack<T> _stack = new();
         /// <summary>
         /// Maximum number of entries allowed for the cache.
         /// </summary>
         private const int MAXIMUM_CACHE_COUNT = 50;
 
-        static ObjectCaches()
-        {
-            _stack = new();
-        }
-
         /// <summary>
         /// Returns a value from the stack or creates an instance when the stack is empty.
         /// </summary>