AdminToyList

Author: louis1706

EXILED/Exiled.Events/Events.cs

@@ -81,9 +81,13 @@ public override void OnEnabled()
             RagdollManager.OnRagdollRemoved += Handlers.Internal.RagdollList.OnRemovedRagdoll;
             ItemPickupBase.OnPickupAdded += Handlers.Internal.PickupEvent.OnSpawnedPickup;
             ItemPickupBase.OnPickupDestroyed += Handlers.Internal.PickupEvent.OnRemovedPickup;
-            ServerConsole.ReloadServerName();
+
+            AdminToys.AdminToyBase.OnAdded += Handlers.Internal.AdminToyList.OnAddedAdminToys;
+            AdminToys.AdminToyBase.OnRemoved += Handlers.Internal.AdminToyList.OnRemovedAdminToys;
 
             ServerSpecificSettingsSync.ServerOnSettingValueReceived += SettingBase.OnSettingUpdated;
+
+            ServerConsole.ReloadServerName();
         }
 
         /// <inheritdoc/>

EXILED/Exiled.Events/Handlers/Internal/AdminToyList.cs

@@ -0,0 +1,27 @@
+// -----------------------------------------------------------------------
+// <copyright file="AdminToyList.cs" company="ExMod Team">
+// Copyright (c) ExMod Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.Handlers.Internal
+{
+    /// <summary>
+    /// Handles adding and removing from <see cref="Exiled.API.Features.Toys.AdminToy.List"/>.
+    /// </summary>
+    internal static class AdminToyList
+    {
+        /// <summary>
+        /// Called after a ragdoll is spawned. Hooked to <see cref="AdminToys.AdminToyBase.OnAdded"/>.
+        /// </summary>
+        /// <param name="adminToy">The spawned ragdoll.</param>
+        public static void OnAddedAdminToys(AdminToys.AdminToyBase adminToy) => API.Features.Toys.AdminToy.Get(adminToy);
+
+        /// <summary>
+        /// Called before a ragdoll is destroyed. Hooked to <see cref="AdminToys.AdminToyBase.OnRemoved"/>.
+        /// </summary>
+        /// <param name="adminToy">The destroyed ragdoll.</param>
+        public static void OnRemovedAdminToys(AdminToys.AdminToyBase adminToy) => API.Features.Toys.AdminToy.BaseToAdminToy.Remove(adminToy);
+    }
+}

EXILED/Exiled.Events/Handlers/Internal/SceneUnloaded.cs

@@ -35,7 +35,6 @@ public static void OnSceneUnloaded(Scene _)
         {
             Player.UserIdsCache.Clear();
             Player.Dictionary.Clear();
-            AdminToy.BaseToAdminToy.Clear();
         }
     }
 }