From fe5fb32e1e80ad2e4e65654f704781c9a58b642c Mon Sep 17 00:00:00 2001
From: x3rt <git@x3rt.dev>
Date: Sat, 19 Apr 2025 06:54:26 -0600
Subject: [PATCH 1/9] minimal performance improvement

---
 LabApi/Features/Stores/CustomDataStore.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/LabApi/Features/Stores/CustomDataStore.cs b/LabApi/Features/Stores/CustomDataStore.cs
index 8677c738..0015d41c 100644
--- a/LabApi/Features/Stores/CustomDataStore.cs
+++ b/LabApi/Features/Stores/CustomDataStore.cs
@@ -39,9 +39,6 @@ public static TStore GetOrAdd<TStore>(Player player)
     {
         Type type = typeof(TStore);
 
-        if (!CustomDataStoreManager.IsRegistered<TStore>())
-            CustomDataStoreManager.RegisterStore<TStore>();
-
         if (!StoreInstances.TryGetValue(type, out Dictionary<Player, CustomDataStore>? playerStores))
         {
             playerStores = new Dictionary<Player, CustomDataStore>();
@@ -51,6 +48,9 @@ public static TStore GetOrAdd<TStore>(Player player)
         if (playerStores.TryGetValue(player, out CustomDataStore? store))
             return (TStore)store;
 
+        if (!CustomDataStoreManager.IsRegistered<TStore>())
+            CustomDataStoreManager.RegisterStore<TStore>();
+
         store = (TStore)Activator.CreateInstance(type, player);
         playerStores[player] = store;
 

From a2760fbb724cf303ad21c46153521e5b08f2dc3d Mon Sep 17 00:00:00 2001
From: x3rt <git@x3rt.dev>
Date: Wed, 30 Apr 2025 17:46:24 -0600
Subject: [PATCH 2/9] remove reflection

---
 .../Features/Stores/CustomDataStoreManager.cs | 53 +++++++------------
 LabApi/Features/Stores/StoreHandler.cs        | 13 +++++
 2 files changed, 31 insertions(+), 35 deletions(-)
 create mode 100644 LabApi/Features/Stores/StoreHandler.cs

diff --git a/LabApi/Features/Stores/CustomDataStoreManager.cs b/LabApi/Features/Stores/CustomDataStoreManager.cs
index 57add4ba..83ff4a1c 100644
--- a/LabApi/Features/Stores/CustomDataStoreManager.cs
+++ b/LabApi/Features/Stores/CustomDataStoreManager.cs
@@ -10,10 +10,8 @@ namespace LabApi.Features.Stores;
 /// </summary>
 public static class CustomDataStoreManager
 {
-    private static readonly List<Type> RegisteredStores = new ();
-    private static readonly Dictionary<Type, MethodInfo> GetOrAddMethods = new ();
-    private static readonly Dictionary<Type, MethodInfo> DestroyMethods = new ();
-    private static readonly Dictionary<Type, MethodInfo> DestroyAllMethods = new ();
+    private static readonly HashSet<Type> RegisteredStores = new();
+    private static readonly Dictionary<Type, StoreHandler> Handlers = new();
 
     /// <summary>
     /// Registers a custom data store.
@@ -24,29 +22,17 @@ public static bool RegisterStore<T>()
         where T : CustomDataStore
     {
         Type type = typeof(T);
-        if (RegisteredStores.Contains(type)) return false;
-
-        MethodInfo? getOrAddMethod = typeof(CustomDataStore).GetMethod(nameof(CustomDataStore.GetOrAdd), BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
-        if (getOrAddMethod == null)
-            return false;
-
-        getOrAddMethod = getOrAddMethod.MakeGenericMethod(type);
-        GetOrAddMethods.Add(type, getOrAddMethod);
-
-        MethodInfo? destroyMethod = typeof(CustomDataStore).GetMethod(nameof(CustomDataStore.Destroy), BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
-        if (destroyMethod == null)
-            return false;
-
-        destroyMethod = destroyMethod.MakeGenericMethod(type);
-        DestroyMethods.Add(type, destroyMethod);
-
-        MethodInfo? destroyAllMethod = typeof(CustomDataStore).GetMethod(nameof(CustomDataStore.DestroyAll), BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
-        if (destroyAllMethod == null)
+        if (RegisteredStores.Contains(type))
             return false;
 
-        destroyAllMethod = destroyAllMethod.MakeGenericMethod(type);
-        DestroyAllMethods.Add(type, destroyAllMethod);
+        StoreHandler handler = new()
+        {
+            AddPlayer = player => CustomDataStore.GetOrAdd<T>(player),
+            RemovePlayer = CustomDataStore.Destroy<T>,
+            DestroyAll = CustomDataStore.DestroyAll<T>
+        };
 
+        Handlers.Add(type, handler);
         RegisteredStores.Add(type);
 
         return true;
@@ -60,26 +46,23 @@ public static void UnregisterStore<T>()
         where T : CustomDataStore
     {
         Type type = typeof(T);
-        
-        if (DestroyAllMethods.TryGetValue(type, out MethodInfo? method))
-            method.Invoke(null, null);
+        if (Handlers.TryGetValue(type, out StoreHandler? handler))
+            handler.DestroyAll();
 
-        DestroyAllMethods.Remove(type);
         RegisteredStores.Remove(type);
-        GetOrAddMethods.Remove(type);
-        DestroyMethods.Remove(type);
+        Handlers.Remove(type);
     }
 
     internal static void AddPlayer(Player player)
     {
-        foreach (Type? storeType in RegisteredStores)
-            GetOrAddMethods[storeType].Invoke(null, new object[] { player });
+        foreach (StoreHandler? handler in Handlers.Values)
+            handler.AddPlayer(player);
     }
 
-    internal  static void RemovePlayer(Player player)
+    internal static void RemovePlayer(Player player)
     {
-        foreach (Type? storeType in RegisteredStores)
-            DestroyMethods[storeType].Invoke(null, new object[] { player });
+        foreach (StoreHandler? handler in Handlers.Values)
+            handler.RemovePlayer(player);
     }
 
     internal static bool IsRegistered(Type type) => RegisteredStores.Contains(type);
diff --git a/LabApi/Features/Stores/StoreHandler.cs b/LabApi/Features/Stores/StoreHandler.cs
new file mode 100644
index 00000000..14666b58
--- /dev/null
+++ b/LabApi/Features/Stores/StoreHandler.cs
@@ -0,0 +1,13 @@
+using System;
+using LabApi.Features.Wrappers;
+
+namespace LabApi.Features.Stores;
+
+internal class StoreHandler
+{
+    internal required Action<Player> AddPlayer { get; init; }
+
+    internal required Action<Player> RemovePlayer { get; init; }
+
+    internal required Action DestroyAll { get; init; }
+}
\ No newline at end of file

From 61c4c9b65bd643d6f30dd45990566efafc28e03f Mon Sep 17 00:00:00 2001
From: x3rt <git@x3rt.dev>
Date: Wed, 30 Apr 2025 17:51:36 -0600
Subject: [PATCH 3/9] Stop registering store in GetOrAdd

---
 LabApi/Features/Stores/CustomDataStore.cs        | 3 ---
 LabApi/Features/Stores/CustomDataStoreManager.cs | 9 +--------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/LabApi/Features/Stores/CustomDataStore.cs b/LabApi/Features/Stores/CustomDataStore.cs
index 0015d41c..64fd2808 100644
--- a/LabApi/Features/Stores/CustomDataStore.cs
+++ b/LabApi/Features/Stores/CustomDataStore.cs
@@ -48,9 +48,6 @@ public static TStore GetOrAdd<TStore>(Player player)
         if (playerStores.TryGetValue(player, out CustomDataStore? store))
             return (TStore)store;
 
-        if (!CustomDataStoreManager.IsRegistered<TStore>())
-            CustomDataStoreManager.RegisterStore<TStore>();
-
         store = (TStore)Activator.CreateInstance(type, player);
         playerStores[player] = store;
 
diff --git a/LabApi/Features/Stores/CustomDataStoreManager.cs b/LabApi/Features/Stores/CustomDataStoreManager.cs
index 83ff4a1c..86f618e9 100644
--- a/LabApi/Features/Stores/CustomDataStoreManager.cs
+++ b/LabApi/Features/Stores/CustomDataStoreManager.cs
@@ -10,7 +10,6 @@ namespace LabApi.Features.Stores;
 /// </summary>
 public static class CustomDataStoreManager
 {
-    private static readonly HashSet<Type> RegisteredStores = new();
     private static readonly Dictionary<Type, StoreHandler> Handlers = new();
 
     /// <summary>
@@ -22,7 +21,7 @@ public static bool RegisterStore<T>()
         where T : CustomDataStore
     {
         Type type = typeof(T);
-        if (RegisteredStores.Contains(type))
+        if (Handlers.ContainsKey(type))
             return false;
 
         StoreHandler handler = new()
@@ -33,7 +32,6 @@ public static bool RegisterStore<T>()
         };
 
         Handlers.Add(type, handler);
-        RegisteredStores.Add(type);
 
         return true;
     }
@@ -49,7 +47,6 @@ public static void UnregisterStore<T>()
         if (Handlers.TryGetValue(type, out StoreHandler? handler))
             handler.DestroyAll();
 
-        RegisteredStores.Remove(type);
         Handlers.Remove(type);
     }
 
@@ -64,8 +61,4 @@ internal static void RemovePlayer(Player player)
         foreach (StoreHandler? handler in Handlers.Values)
             handler.RemovePlayer(player);
     }
-
-    internal static bool IsRegistered(Type type) => RegisteredStores.Contains(type);
-
-    internal static bool IsRegistered<T>() => IsRegistered(typeof(T));
 }
\ No newline at end of file

From 23a658485906b7cd41bc78aa5e585fdac5ad2241 Mon Sep 17 00:00:00 2001
From: x3rt <git@x3rt.dev>
Date: Wed, 30 Apr 2025 18:10:36 -0600
Subject: [PATCH 4/9] rename typeparam to TStore

---
 .../Features/Stores/CustomDataStoreManager.cs | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/LabApi/Features/Stores/CustomDataStoreManager.cs b/LabApi/Features/Stores/CustomDataStoreManager.cs
index 86f618e9..9a9c5b54 100644
--- a/LabApi/Features/Stores/CustomDataStoreManager.cs
+++ b/LabApi/Features/Stores/CustomDataStoreManager.cs
@@ -15,20 +15,20 @@ public static class CustomDataStoreManager
     /// <summary>
     /// Registers a custom data store.
     /// </summary>
-    /// <typeparam name="T">The type of the custom data store.</typeparam>
+    /// <typeparam name="TStore">The type of the custom data store.</typeparam>
     /// <returns>Whether the store was successfully registered.</returns>
-    public static bool RegisterStore<T>()
-        where T : CustomDataStore
+    public static bool RegisterStore<TStore>()
+        where TStore : CustomDataStore
     {
-        Type type = typeof(T);
+        Type type = typeof(TStore);
         if (Handlers.ContainsKey(type))
             return false;
 
         StoreHandler handler = new()
         {
-            AddPlayer = player => CustomDataStore.GetOrAdd<T>(player),
-            RemovePlayer = CustomDataStore.Destroy<T>,
-            DestroyAll = CustomDataStore.DestroyAll<T>
+            AddPlayer = player => CustomDataStore.GetOrAdd<TStore>(player),
+            RemovePlayer = CustomDataStore.Destroy<TStore>,
+            DestroyAll = CustomDataStore.DestroyAll<TStore>
         };
 
         Handlers.Add(type, handler);
@@ -39,11 +39,11 @@ public static bool RegisterStore<T>()
     /// <summary>
     /// Unregisters a custom data store.
     /// </summary>
-    /// <typeparam name="T">The type of the custom data store.</typeparam>
-    public static void UnregisterStore<T>()
-        where T : CustomDataStore
+    /// <typeparam name="TStore">The type of the custom data store.</typeparam>
+    public static void UnregisterStore<TStore>()
+        where TStore : CustomDataStore
     {
-        Type type = typeof(T);
+        Type type = typeof(TStore);
         if (Handlers.TryGetValue(type, out StoreHandler? handler))
             handler.DestroyAll();
 

From ead72960c915264fb0d30ef9e92e5960b38d362e Mon Sep 17 00:00:00 2001
From: x3rt <git@x3rt.dev>
Date: Wed, 30 Apr 2025 18:12:03 -0600
Subject: [PATCH 5/9] move InternalOnInstanceCreated out of ctor

---
 LabApi/Features/Stores/CustomDataStore.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LabApi/Features/Stores/CustomDataStore.cs b/LabApi/Features/Stores/CustomDataStore.cs
index 64fd2808..296dac78 100644
--- a/LabApi/Features/Stores/CustomDataStore.cs
+++ b/LabApi/Features/Stores/CustomDataStore.cs
@@ -25,7 +25,6 @@ public abstract class CustomDataStore
     protected CustomDataStore(Player owner)
     {
         Owner = owner;
-        InternalOnInstanceCreated();
     }
 
     /// <summary>
@@ -50,6 +49,7 @@ public static TStore GetOrAdd<TStore>(Player player)
 
         store = (TStore)Activator.CreateInstance(type, player);
         playerStores[player] = store;
+        store.InternalOnInstanceCreated();
 
         return (TStore)store;
     }
@@ -99,7 +99,7 @@ internal static void DestroyAll<TStore>()
     /// <summary>
     /// Destroys this instance of the <see cref="CustomDataStore"/>.
     /// </summary>
-    internal void Destroy()
+    private void Destroy()
     {
         OnInstanceDestroyed();
         StoreInstances[this.GetType()].Remove(Owner);

From 0ccde137147e6ec52a83f94984fc9316a693c9c9 Mon Sep 17 00:00:00 2001
From: x3rt <git@x3rt.dev>
Date: Wed, 30 Apr 2025 18:20:46 -0600
Subject: [PATCH 6/9] add GetAll method

---
 LabApi/Features/Stores/CustomDataStore.cs | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/LabApi/Features/Stores/CustomDataStore.cs b/LabApi/Features/Stores/CustomDataStore.cs
index 296dac78..c6e28a43 100644
--- a/LabApi/Features/Stores/CustomDataStore.cs
+++ b/LabApi/Features/Stores/CustomDataStore.cs
@@ -53,6 +53,20 @@ public static TStore GetOrAdd<TStore>(Player player)
 
         return (TStore)store;
     }
+    
+    /// <summary>
+    /// Gets all instances of the <see cref="CustomDataStore"/> for the specified type.
+    /// </summary>
+    /// <typeparam name="TStore">The type of the <see cref="CustomDataStore"/>.</typeparam>
+    /// <returns>An <see cref="IEnumerable{TStore}"/> of all instances of the <see cref="CustomDataStore"/>.</returns>
+    public static IEnumerable<(Player Player, TStore Store)> GetAll<TStore>()
+        where TStore : CustomDataStore
+    {
+        if (!StoreInstances.TryGetValue(typeof(TStore), out Dictionary<Player, CustomDataStore>? playerStores))
+            return Enumerable.Empty<(Player, TStore)>();
+
+        return playerStores.Select(entry => (entry.Key, (TStore)entry.Value));
+    }
 
     /// <summary>
     /// Called when a new instance of the <see cref="CustomDataStore"/> is created.
@@ -124,10 +138,9 @@ protected CustomDataStore(Player owner)
     {
     }
 
-    /// <summary>
-    /// Gets the <see cref="CustomDataStore"/> for the specified <see cref="Player"/>.
-    /// </summary>
-    /// <param name="player">The <see cref="Player"/> to get the <see cref="CustomDataStore"/> for.</param>
-    /// <returns>The <see cref="CustomDataStore"/> for the specified <see cref="Player"/>.</returns>
+    /// <inheritdoc cref="CustomDataStore.GetOrAdd{TStore}"/>
     public static TStore Get(Player player) => GetOrAdd<TStore>(player);
+    
+    /// <inheritdoc cref="CustomDataStore.GetAll{TStore}"/>
+    public static IEnumerable<(Player Player, TStore Store)> GetAll() => CustomDataStore.GetAll<TStore>();
 }
\ No newline at end of file

From c1527c66123096ed417707f62e7471de635f660d Mon Sep 17 00:00:00 2001
From: Cyn <181435937+xCynDev@users.noreply.github.com>
Date: Fri, 2 May 2025 00:49:52 -0700
Subject: [PATCH 7/9] Add CustomDataStore.Exists, alongside helper method on
 Player (#99)

---
 LabApi/Features/Stores/CustomDataStore.cs  | 20 ++++++++++++++++++++
 LabApi/Features/Wrappers/Players/Player.cs | 11 +++++++++++
 2 files changed, 31 insertions(+)

diff --git a/LabApi/Features/Stores/CustomDataStore.cs b/LabApi/Features/Stores/CustomDataStore.cs
index c6e28a43..19bf2542 100644
--- a/LabApi/Features/Stores/CustomDataStore.cs
+++ b/LabApi/Features/Stores/CustomDataStore.cs
@@ -54,6 +54,23 @@ public static TStore GetOrAdd<TStore>(Player player)
         return (TStore)store;
     }
     
+    /// <summary>
+    /// Checks if the <see cref="CustomDataStore"/> for the specified <see cref="Player"/> exists.
+    /// </summary>
+    /// <param name="player"> The <see cref="Player"/> to check the <see cref="CustomDataStore"/> for.</param>
+    /// <typeparam name="TStore">The type of the <see cref="CustomDataStore"/></typeparam>
+    /// <returns>True if the <see cref="CustomDataStore"/> exists for the specified <see cref="Player"/>, false if not.</returns>
+    public static bool Exists<TStore>(Player player)
+        where TStore : CustomDataStore
+    {
+        Type type = typeof(TStore);
+
+        if (!StoreInstances.TryGetValue(type, out Dictionary<Player, CustomDataStore>? playerStores))
+            return false;
+
+        return playerStores.ContainsKey(player);
+    }
+    
     /// <summary>
     /// Gets all instances of the <see cref="CustomDataStore"/> for the specified type.
     /// </summary>
@@ -143,4 +160,7 @@ protected CustomDataStore(Player owner)
     
     /// <inheritdoc cref="CustomDataStore.GetAll{TStore}"/>
     public static IEnumerable<(Player Player, TStore Store)> GetAll() => CustomDataStore.GetAll<TStore>();
+    
+    /// <inheritdoc cref="CustomDataStore.Exists{TStore}"/>
+    public static bool Exists(Player player) => Exists<TStore>(player);
 }
\ No newline at end of file
diff --git a/LabApi/Features/Wrappers/Players/Player.cs b/LabApi/Features/Wrappers/Players/Player.cs
index 929cb526..de6d196f 100644
--- a/LabApi/Features/Wrappers/Players/Player.cs
+++ b/LabApi/Features/Wrappers/Players/Player.cs
@@ -1503,6 +1503,17 @@ public TStore GetDataStore<TStore>()
     {
         return CustomDataStore.GetOrAdd<TStore>(this);
     }
+    
+    /// <summary>
+    /// Checks if the <see cref="CustomDataStore"/> exists on the player.
+    /// </summary>
+    /// <typeparam name="TStore">The type of the <see cref="CustomDataStore"/></typeparam>
+    /// <returns>True if the <see cref="CustomDataStore"/> exists on the player, false if not.</returns>
+    public bool HasDataStore<TStore>()
+        where TStore : CustomDataStore
+    {
+        return CustomDataStore.Exists<TStore>(this);
+    }
 
     /// <summary>
     /// Handles the creation of a player in the server.

From d8f64aa4974d25c3cdacf1cd4c83ba8f3c05bf57 Mon Sep 17 00:00:00 2001
From: x3rt <git@x3rt.dev>
Date: Thu, 29 May 2025 14:42:22 -0600
Subject: [PATCH 8/9] Add Regular Get<T>, and public Destroy<T>

---
 LabApi/Features/Stores/CustomDataStore.cs     | 74 +++++++++++++------
 .../Features/Stores/CustomDataStoreManager.cs |  4 +-
 2 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/LabApi/Features/Stores/CustomDataStore.cs b/LabApi/Features/Stores/CustomDataStore.cs
index 19bf2542..7468ba0d 100644
--- a/LabApi/Features/Stores/CustomDataStore.cs
+++ b/LabApi/Features/Stores/CustomDataStore.cs
@@ -11,7 +11,7 @@ namespace LabApi.Features.Stores;
 /// </summary>
 public abstract class CustomDataStore
 {
-    private static readonly Dictionary<Type, Dictionary<Player, CustomDataStore>> StoreInstances = new ();
+    private static readonly Dictionary<Type, Dictionary<Player, CustomDataStore>> StoreInstances = new();
 
     /// <summary>
     /// Gets the <see cref="Player"/> that this instance is associated with.
@@ -53,7 +53,46 @@ public static TStore GetOrAdd<TStore>(Player player)
 
         return (TStore)store;
     }
-    
+
+    /// <summary>
+    /// Gets the <see cref="CustomDataStore"/> for the specified <see cref="Player"/> if it exists.
+    /// </summary>
+    /// <param name="player">The <see cref="Player"/> to get the <see cref="CustomDataStore"/> for.</param>
+    /// <typeparam name="TStore">The type of the <see cref="CustomDataStore"/>.</typeparam>
+    /// <returns>The <see cref="CustomDataStore"/> for the specified <see cref="Player"/> or null if it doesn't exist.</returns>
+    public static TStore? Get<TStore>(Player player)
+        where TStore : CustomDataStore
+    {
+        Type type = typeof(TStore);
+
+        if (!StoreInstances.TryGetValue(type, out Dictionary<Player, CustomDataStore>? playerStores))
+            return null;
+
+        if (playerStores.TryGetValue(player, out CustomDataStore? store))
+            return (TStore)store;
+
+        return null;
+    }
+
+    /// <summary>
+    /// Destroys the <see cref="CustomDataStore"/> for the specified <see cref="Player"/>.
+    /// </summary>
+    /// <param name="player">The <see cref="Player"/> to destroy the <see cref="CustomDataStore"/> for.</param>
+    /// <typeparam name="TStore">The type of the <see cref="CustomDataStore"/>.</typeparam>
+    /// <returns>Whether the <see cref="CustomDataStore"/> was successfully destroyed.</returns>
+    public static bool Destroy<TStore>(Player player)
+        where TStore : CustomDataStore
+    {
+        if (!StoreInstances.TryGetValue(typeof(TStore), out Dictionary<Player, CustomDataStore>? playerStores))
+            return false;
+
+        if (!playerStores.TryGetValue(player, out CustomDataStore? store))
+            return false;
+
+        store.Destroy();
+        return true;
+    }
+
     /// <summary>
     /// Checks if the <see cref="CustomDataStore"/> for the specified <see cref="Player"/> exists.
     /// </summary>
@@ -70,7 +109,7 @@ public static bool Exists<TStore>(Player player)
 
         return playerStores.ContainsKey(player);
     }
-    
+
     /// <summary>
     /// Gets all instances of the <see cref="CustomDataStore"/> for the specified type.
     /// </summary>
@@ -95,23 +134,6 @@ protected virtual void OnInstanceCreated() { }
     /// </summary>
     protected virtual void OnInstanceDestroyed() { }
 
-    /// <summary>
-    /// Destroys the <see cref="CustomDataStore"/> for the specified <see cref="Player"/>.
-    /// </summary>
-    /// <param name="player">The <see cref="Player"/> to destroy the <see cref="CustomDataStore"/> for.</param>
-    /// <typeparam name="TStore">The type of the <see cref="CustomDataStore"/>.</typeparam>
-    internal static void Destroy<TStore>(Player player)
-        where TStore : CustomDataStore
-    {
-        if (!StoreInstances.TryGetValue(typeof(TStore), out Dictionary<Player, CustomDataStore>? playerStores))
-            return;
-
-        if (!playerStores.TryGetValue(player, out CustomDataStore? store))
-            return;
-
-        store.Destroy();
-    }
-
     /// <summary>
     /// Destroys all instances of the <see cref="CustomDataStore"/> for the specified type.
     /// </summary>
@@ -156,11 +178,17 @@ protected CustomDataStore(Player owner)
     }
 
     /// <inheritdoc cref="CustomDataStore.GetOrAdd{TStore}"/>
-    public static TStore Get(Player player) => GetOrAdd<TStore>(player);
-    
+    public static TStore GetOrAdd(Player player) => GetOrAdd<TStore>(player);
+
+    /// <inheritdoc cref="CustomDataStore.Get{TStore}"/>
+    public static TStore? Get(Player player) => Get<TStore>(player);
+
+    /// <inheritdoc cref="CustomDataStore.Destroy{TStore}"/>
+    public static bool Destroy(Player player) => Destroy<TStore>(player);
+
     /// <inheritdoc cref="CustomDataStore.GetAll{TStore}"/>
     public static IEnumerable<(Player Player, TStore Store)> GetAll() => CustomDataStore.GetAll<TStore>();
-    
+
     /// <inheritdoc cref="CustomDataStore.Exists{TStore}"/>
     public static bool Exists(Player player) => Exists<TStore>(player);
 }
\ No newline at end of file
diff --git a/LabApi/Features/Stores/CustomDataStoreManager.cs b/LabApi/Features/Stores/CustomDataStoreManager.cs
index 9a9c5b54..61397ee9 100644
--- a/LabApi/Features/Stores/CustomDataStoreManager.cs
+++ b/LabApi/Features/Stores/CustomDataStoreManager.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using LabApi.Features.Wrappers;
 
 namespace LabApi.Features.Stores;
@@ -17,6 +16,7 @@ public static class CustomDataStoreManager
     /// </summary>
     /// <typeparam name="TStore">The type of the custom data store.</typeparam>
     /// <returns>Whether the store was successfully registered.</returns>
+    /// <remarks>Once registered, the store will be automatically created for all players when they join the server.</remarks>
     public static bool RegisterStore<TStore>()
         where TStore : CustomDataStore
     {
@@ -27,7 +27,7 @@ public static bool RegisterStore<TStore>()
         StoreHandler handler = new()
         {
             AddPlayer = player => CustomDataStore.GetOrAdd<TStore>(player),
-            RemovePlayer = CustomDataStore.Destroy<TStore>,
+            RemovePlayer = player => CustomDataStore.Destroy<TStore>(player),
             DestroyAll = CustomDataStore.DestroyAll<TStore>
         };
 

From 1fc197c86d267a275261bca91258f147340d163a Mon Sep 17 00:00:00 2001
From: x3rt <git@x3rt.dev>
Date: Thu, 29 May 2025 14:58:10 -0600
Subject: [PATCH 9/9] Add TryGet<T>

---
 LabApi/Features/Stores/CustomDataStore.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/LabApi/Features/Stores/CustomDataStore.cs b/LabApi/Features/Stores/CustomDataStore.cs
index 7468ba0d..8e05948d 100644
--- a/LabApi/Features/Stores/CustomDataStore.cs
+++ b/LabApi/Features/Stores/CustomDataStore.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using LabApi.Features.Wrappers;
 using NorthwoodLib.Pools;
@@ -74,6 +75,20 @@ public static TStore GetOrAdd<TStore>(Player player)
         return null;
     }
 
+    /// <summary>
+    /// Tries to get the <see cref="CustomDataStore"/> for the specified <see cref="Player"/>.
+    /// </summary>
+    /// <param name="player">The <see cref="Player"/> to get the <see cref="CustomDataStore"/> for.</param>
+    /// <param name="store">The <see cref="CustomDataStore"/> for the specified <see cref="Player"/>.</param>
+    /// <typeparam name="TStore">The type of the <see cref="CustomDataStore"/>.</typeparam>
+    /// <returns>Whether the <see cref="CustomDataStore"/> was successfully retrieved.</returns>
+    public static bool TryGet<TStore>(Player player, [NotNullWhen(true)] out TStore? store)
+        where TStore : CustomDataStore
+    {
+        store = Get<TStore>(player);
+        return store != null;
+    }
+
     /// <summary>
     /// Destroys the <see cref="CustomDataStore"/> for the specified <see cref="Player"/>.
     /// </summary>
@@ -183,6 +198,9 @@ protected CustomDataStore(Player owner)
     /// <inheritdoc cref="CustomDataStore.Get{TStore}"/>
     public static TStore? Get(Player player) => Get<TStore>(player);
 
+    /// <inheritdoc cref="CustomDataStore.TryGet{TStore}"/>
+    public static bool TryGet(Player player, [NotNullWhen(true)] out TStore? store) => TryGet<TStore>(player, out store);
+
     /// <inheritdoc cref="CustomDataStore.Destroy{TStore}"/>
     public static bool Destroy(Player player) => Destroy<TStore>(player);