com.wallstop-studios.unity-helpers 2.0.0-rc79.8 → 2.0.0-rc79.9

package/Runtime/Core/Random/AbstractRandom.cs

@@ -407,9 +407,79 @@ namespace WallstopStudios.UnityHelpers.Core.Random
             {
                 return NextOf(list);
             }
-
             int index = Next(collection.Count);
-            return collection.ElementAt(index);
+
+            switch (collection)
+            {
+                case HashSet<T> hashSet:
+                {
+                    int i = 0;
+                    foreach (T element in hashSet)
+                    {
+                        if (index == i++)
+                        {
+                            return element;
+                        }
+                    }
+                    throw new ArgumentException(nameof(collection));
+                }
+                case SortedSet<T> sortedSet:
+                {
+                    int i = 0;
+                    foreach (T element in sortedSet)
+                    {
+                        if (index == i++)
+                        {
+                            return element;
+                        }
+                    }
+
+                    throw new ArgumentException(nameof(collection));
+                }
+                case LinkedList<T> linkedList:
+                {
+                    int i = 0;
+                    foreach (T element in linkedList)
+                    {
+                        if (index == i++)
+                        {
+                            return element;
+                        }
+                    }
+
+                    throw new ArgumentException(nameof(collection));
+                }
+                case Queue<T> queue:
+                {
+                    int i = 0;
+                    foreach (T element in queue)
+                    {
+                        if (index == i++)
+                        {
+                            return element;
+                        }
+                    }
+
+                    throw new ArgumentException(nameof(collection));
+                }
+                case Stack<T> stack:
+                {
+                    int i = 0;
+                    foreach (T element in stack)
+                    {
+                        if (index == i++)
+                        {
+                            return element;
+                        }
+                    }
+
+                    throw new ArgumentException(nameof(collection));
+                }
+                default:
+                {
+                    return collection.ElementAt(index);
+                }
+            }
         }
 
         public T NextOf<T>(IReadOnlyList<T> list)

package/Runtime/Utils/Buffers.cs

@@ -5,6 +5,7 @@ namespace WallstopStudios.UnityHelpers.Utils
     using System.Reflection;
     using System.Text;
     using UnityEngine;
+    using WallstopStudios.UnityHelpers.Core.Helper;
 
     public static class Buffers
     {
@@ -38,10 +39,16 @@ namespace WallstopStudios.UnityHelpers.Utils
     public static class WallstopGenericPool<T>
         where T : new()
     {
+        public static Action<T> clearAction;
+
         private static readonly List<T> _pool = new();
-        private static readonly Action<T> _clearAction = GetClearAction();
         private static readonly Action<T> _onDispose = Release;
 
+        static WallstopGenericPool()
+        {
+            clearAction = GetClearAction();
+        }
+
         public static PooledResource<T> Get()
         {
             if (_pool.Count == 0)
@@ -57,26 +64,34 @@ namespace WallstopStudios.UnityHelpers.Utils
 
         private static Action<T> GetClearAction()
         {
-            Type type = typeof(T);
-            foreach (
-                MethodInfo method in type.GetMethods(BindingFlags.Instance | BindingFlags.Public)
-            )
+            try
             {
-                if (
-                    string.Equals(method.Name, "Clear", StringComparison.Ordinal)
-                    && method.GetParameters().Length == 0
+                Type type = typeof(T);
+                foreach (
+                    MethodInfo method in type.GetMethods(
+                        BindingFlags.Instance | BindingFlags.Public
+                    )
                 )
                 {
-                    return (Action<T>)Delegate.CreateDelegate(typeof(Action<T>), method);
+                    if (
+                        string.Equals(method.Name, "Clear", StringComparison.Ordinal)
+                        && method.GetParameters().Length == 0
+                    )
+                    {
+                        return (Action<T>)Delegate.CreateDelegate(typeof(Action<T>), method);
+                    }
                 }
             }
-
-            return _ => { };
+            catch
+            {
+                // Swallow
+            }
+            return null;
         }
 
         private static void Release(T resource)
         {
-            _clearAction.Invoke(resource);
+            clearAction?.Invoke(resource);
             _pool.Add(resource);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc79.8",
+  "version": "2.0.0-rc79.9",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -52,3 +52,4 @@
 
 
 
+