Fixed CustomItems being unregistered when dropped

Author: Mr-Baguetter

UncomplicatedCustomItems.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.0.11010.61
+VisualStudioVersion = 18.3.11222.16 d18.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UncomplicatedCustomItems", "UncomplicatedCustomItems\UncomplicatedCustomItems.csproj", "{B39EE633-0EFE-42FC-B3E8-C6C4C86029E5}"
 EndProject

UncomplicatedCustomItems/API/Features/SummonedCustomItem.cs

@@ -46,20 +46,7 @@ public class SummonedCustomItem
         /// </summary>
         public static List<SummonedCustomItem> List { get; } = [];
 
-        /// <summary>
-        /// Cache of all <see cref="SummonedCustomItem"/> instances mapped by their <see cref="Serial"/>.
-        /// </summary>
-        public static readonly ConcurrentDictionary<ushort, SummonedCustomItem> bySerial = new();
-
-        /// <summary>
-        /// Cache of all <see cref="SummonedCustomItem"/> instances grouped by their owner's <see cref="Player.PlayerId"/>.
-        /// </summary>
-        public static readonly ConcurrentDictionary<int, ConcurrentBag<SummonedCustomItem>> byPlayerId = new();
-
-        /// <summary>
-        /// HashSet for faster existence checks and removal operations
-        /// </summary>
-        private static readonly ConcurrentDictionary<ushort, byte> _activeSerials = new();
+        private static readonly HashSet<ushort> _activeSerials = [];
 
         /// <summary>
         /// Gets the list of items that can be managed by the function <see cref="HandleCustomAction"/>
@@ -141,7 +128,9 @@ public class SummonedCustomItem
                 Pickup.Rotation = rotation;
 
             SetProperties();
-            AddToCollections(this);
+            List.Add(this);
+            _activeSerials.Add(this.Serial);
+
             if (Item is FirearmItem firearm)
                 StartAmmoRegen(firearm);
         }
@@ -159,23 +148,6 @@ public SummonedCustomItem(ICustomItem customItem, Exiled.API.Features.Player pla
 
         public SummonedCustomItem(ICustomItem customItem, Exiled.API.Features.Player player, Item item) : this(customItem, Player.Get(player.Id), item, null) { }
 #endif
-
-        private static void AddToCollections(SummonedCustomItem sci)
-        {
-            List.Add(sci);
-            bySerial[sci.Serial] = sci;
-            _activeSerials[sci.Serial] = 0;
-
-            if (sci.Owner != null)
-            {
-                byPlayerId.AddOrUpdate(
-                    sci.Owner.PlayerId,
-                    [sci],
-                    (key, existingBag) => { existingBag.Add(sci); return existingBag; }
-                );
-            }
-        }
-
         public void SetProperties()
         {
             if (Item is not null)
@@ -251,12 +223,10 @@ public void SetProperties()
                         break;
 
                     case CustomItemType.MicroHID when CustomItem.CustomData is MicroHIDData microData:
-                        {
-                            MicroHIDPickup microHID = (MicroHIDPickup)Pickup;
-                            Pickup.Base.Info.ItemId.TryGetTemplate<InventorySystem.Items.MicroHID.MicroHIDItem>(out var microHIDItem);
-                            microHIDItem.ItemSerial = microHID.Serial;
-                            microHIDItem.EnergyManager.ServerSetEnergy(microHIDItem.ItemSerial, microData.Energy);
-                        }
+                        MicroHIDPickup microHID = (MicroHIDPickup)Pickup;
+                        Pickup.Base.Info.ItemId.TryGetTemplate<InventorySystem.Items.MicroHID.MicroHIDItem>(out var microHIDItem);
+                        microHIDItem.ItemSerial = microHID.Serial;
+                        microHIDItem.EnergyManager.ServerSetEnergy(microHIDItem.ItemSerial, microData.Energy);
                         break;
 
                     case CustomItemType.ParticleDisruptor when CustomItem.CustomData is ParticleDisruptorData pdData:
@@ -1038,17 +1008,7 @@ internal bool HandleCustomAction(Item item)
         public void Destroy()
         {
             List.Remove(this);
-            bySerial.TryRemove(Serial, out _);
-            _activeSerials.TryRemove(Serial, out _);
-
-            if (Owner?.PlayerId != null && byPlayerId.TryGetValue(Owner.PlayerId, out var bag))
-            {
-                ConcurrentBag<SummonedCustomItem> newBag = new(bag.Where(sci => sci.Serial != Serial));
-                if (newBag.IsEmpty)
-                    byPlayerId.TryRemove(Owner.PlayerId, out _);
-                else
-                    byPlayerId[Owner.PlayerId] = newBag;
-            }
+            _activeSerials.Remove(Serial);
 
             if (IsPickup)
                 Pickup?.Destroy();
@@ -1065,45 +1025,49 @@ public void Destroy()
 
         public static bool TryGet(ushort serial, out SummonedCustomItem item)
         {
-            if (!_activeSerials.ContainsKey(serial))
+            if (!_activeSerials.Contains(serial))
             {
                 item = null;
                 return false;
             }
 
-            return bySerial.TryGetValue(serial, out item);
+            item = List.FirstOrDefault(sci => sci.Serial == serial);
+            return item != null;
         }
 
-        public static SummonedCustomItem Get(ushort serial) => _activeSerials.ContainsKey(serial) && bySerial.TryGetValue(serial, out var item) ? item : null;
-
-        public static SummonedCustomItem Get(Player owner, ushort serial)
+        public static SummonedCustomItem Get(ushort serial)
         {
-            if (owner?.PlayerId == null || !_activeSerials.ContainsKey(serial))
+            if (!_activeSerials.Contains(serial))
                 return null;
 
-            if (!byPlayerId.TryGetValue(owner.PlayerId, out var bag))
-                return null;
-
-            return bag.FirstOrDefault(sci => sci.Serial == serial);
+            return List.FirstOrDefault(sci => sci.Serial == serial);
         }
 
-        public static List<SummonedCustomItem> Get(ItemType item)
+        public static SummonedCustomItem Get(Player owner, ushort serial)
         {
-            List<SummonedCustomItem> result = [];
-            List<SummonedCustomItem> items = List.Count > 100 ? List.AsParallel().Where(sci => sci.CustomItem.Item == item).ToList() : List.Where(sci => sci.CustomItem.Item == item).ToList();
+            if (owner?.PlayerId == null)
+                return null;
 
-            return items;
+            if (!_activeSerials.Contains(serial))
+                return null;
+
+            return List.FirstOrDefault(sci => sci.Serial == serial && sci.Owner?.PlayerId == owner.PlayerId);
         }
 
         public static List<SummonedCustomItem> Get(Player owner)
         {
             if (owner?.PlayerId == null)
                 return [];
 
-            if (byPlayerId.TryGetValue(owner.PlayerId, out var bag))
-                return bag.ToList();
+            return List.Where(sci => sci.Owner?.PlayerId == owner.PlayerId).ToList();
+        }
+
+        public static List<SummonedCustomItem> Get(ItemType item)
+        {
+            List<SummonedCustomItem> result = [];
+            List<SummonedCustomItem> items = List.Count > 100 ? List.AsParallel().Where(sci => sci.CustomItem.Item == item).ToList() : List.Where(sci => sci.CustomItem.Item == item).ToList();
 
-            return [];
+            return items;
         }
     }
 }

UncomplicatedCustomItems/Events/ServerHandler.cs

@@ -32,7 +32,6 @@ public static void Register()
             ServerEvent.PickupCreated += OnPickupCreation;
             ServerEvent.RoundStarted += SpawnItemsOnRoundStarted;
             ServerEvent.ProjectileExploded += OnDetonated;
-            ItemPickupBase.OnBeforePickupDestroyed += OnPickupDestroying;
         }
 
         public static void Unregister()
@@ -43,17 +42,6 @@ public static void Unregister()
             ServerEvent.PickupCreated -= OnPickupCreation;
             ServerEvent.RoundStarted -= SpawnItemsOnRoundStarted;
             ServerEvent.ProjectileExploded -= OnDetonated;
-            ItemPickupBase.OnBeforePickupDestroyed -= OnPickupDestroying;
-        }
-        
-        private static void OnPickupDestroying(ItemPickupBase pickupBase)
-        {
-            Pickup pickup = Pickup.Get(pickupBase);
-            if (Utilities.TryGetSummonedCustomItem(pickup.Serial, out var item))
-                item.Destroy();
-
-            if (SummonedAPICustomItem.TryGet(pickup.Serial, out var api))
-                api.Destroy();
         }
 
         private static void OnDetonated(ProjectileExplodedEventArgs ev)

UncomplicatedCustomItems/Plugin.cs

@@ -52,7 +52,7 @@ public class Plugin : Plugin<Config>
 #else
 		public override Version RequiredApiVersion { get; } = LabApi.Features.LabApiProperties.CurrentVersion;
 #endif
-		public override Version Version { get; } = new(4, 0, 1);
+		public override Version Version { get; } = new(4, 0, 2);
 
 		public Assembly Assembly => Assembly.GetExecutingAssembly();
 #if EXILED