Add OnAdd, OnRemove to BaseObjectPool and improve mock id and ptr free

Author: FabianTerhorst

api/AltV.Net.Mock/MockBlipPool.cs

@@ -8,5 +8,10 @@ public class MockBlipPool : BlipPool
         public MockBlipPool(IBaseObjectFactory<IBlip> blipFactory) : base(blipFactory)
         {
         }
+
+        public override void OnRemove(IBlip entity)
+        {
+            MockEntities.FreeNoId(entity.NativePointer);
+        }
     }
 }

api/AltV.Net.Mock/MockCheckpointPool.cs

@@ -8,5 +8,10 @@ public class MockCheckpointPool : CheckpointPool
         public MockCheckpointPool(IBaseObjectFactory<ICheckpoint> checkpointFactory) : base(checkpointFactory)
         {
         }
+
+        public override void OnRemove(ICheckpoint entity)
+        {
+            MockEntities.FreeNoId(entity.NativePointer);
+        }
     }
 }

api/AltV.Net.Mock/MockEntities.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace AltV.Net.Mock
 {
@@ -7,16 +8,40 @@ public static class MockEntities
         private static IntPtr _ptr = IntPtr.Zero;
 
         private static ushort _id = 0;
+        
+        private static readonly Stack<IntPtr> FreePointers = new Stack<IntPtr>();
+        
+        private static readonly Stack<ushort> FreeIds = new Stack<ushort>();
 
         public static IntPtr GetNextPtr(out ushort id)
         {
+            if (FreeIds.Count > 0 && FreePointers.Count > 0)
+            {
+                id = FreeIds.Pop();
+                return FreePointers.Pop();
+            }
             _ptr += 1;
             id = ++_id;
             return _ptr;
         }
+
+        public static void Free(IntPtr intPtr, ushort id)
+        {
+            FreeIds.Push(id);
+            FreePointers.Push(intPtr);
+        }
+        
+        public static void FreeNoId(IntPtr intPtr)
+        {
+            FreePointers.Push(intPtr);
+        }
 
         public static IntPtr GetNextPtrNoId()
         {
+            if (FreePointers.Count > 0)
+            {
+                return FreePointers.Pop();
+            }
             _ptr += 1;
             return _ptr;
         }

api/AltV.Net.Mock/MockPlayerPool.cs

@@ -14,5 +14,10 @@ public override ushort GetId(IntPtr entityPointer)
         {
             return 0;
         }
+
+        public override void OnRemove(IPlayer entity)
+        {
+            MockEntities.Free(entity.NativePointer, entity.Id);
+        }
     }
 }

api/AltV.Net.Mock/MockVehiclePool.cs

@@ -14,5 +14,10 @@ public override ushort GetId(IntPtr entityPointer)
         {
             return 0;
         }
+
+        public override void OnRemove(IVehicle entity)
+        {
+            MockEntities.Free(entity.NativePointer, entity.Id);
+        }
     }
 }

api/AltV.Net.Mock/MockVoiceChannelPool.cs

@@ -8,5 +8,10 @@ public class MockVoiceChannelPool : VoiceChannelPool
         public MockVoiceChannelPool(IBaseObjectFactory<IVoiceChannel> voiceChannelFactory) : base(voiceChannelFactory)
         {
         }
+
+        public override void OnRemove(IVoiceChannel entity)
+        {
+            MockEntities.FreeNoId(entity.NativePointer);
+        }
     }
 }

api/AltV.Net/Elements/Pools/BaseObjectPool.cs

@@ -22,7 +22,7 @@ protected BaseObjectPool(IBaseObjectFactory<TBaseObject> entityFactory)
         {
             this.entityFactory = entityFactory;
         }
-        
+
         public void Create(IntPtr entityPointer)
         {
             Add(entityFactory.Create(entityPointer));
@@ -37,6 +37,7 @@ public void Create(IntPtr entityPointer, out TBaseObject entity)
         public void Add(TBaseObject entity)
         {
             entities[entity.NativePointer] = entity;
+            OnAdd(entity);
         }
 
         public bool Remove(TBaseObject entity)
@@ -48,6 +49,7 @@ public bool Remove(IntPtr entityPointer)
         {
             if (!entities.Remove(entityPointer, out var entity) || !entity.Exists) return false;
             SetEntityNoLongerExists(entity);
+            OnRemove(entity);
             return true;
         }
 
@@ -75,5 +77,13 @@ public ICollection<TBaseObject> GetAllObjects()
         {
             return entities.Values;
         }
+
+        public virtual void OnAdd(TBaseObject entity)
+        {
+        }
+
+        public virtual void OnRemove(TBaseObject entity)
+        {
+        }
     }
 }