Cleanup mock pointer and mock id

Author: FabianTerhorst

api/AltV.Net.Mock/MockAltV.cs

@@ -38,8 +38,8 @@ public MockAltV(string entryPoint)
 
         public IPlayer ConnectPlayer(string playerName, string reason, Action<IPlayer> intercept = null)
         {
-            var ptr = MockEntities.GetNextPtr();
-            Alt.Module.PlayerPool.Create(ptr, MockEntities.Id, out var player);
+            var ptr = MockEntities.GetNextPtr(out var entityId);
+            Alt.Module.PlayerPool.Create(ptr, entityId, out var player);
             player.Name = playerName;
             intercept?.Invoke(player);
             Alt.Module.OnPlayerConnect(ptr, player.Id, reason);

api/AltV.Net.Mock/MockEntities.cs

@@ -1,20 +1,24 @@
 using System;
-using System.Collections.Generic;
-using AltV.Net.Elements.Entities;
 
 namespace AltV.Net.Mock
 {
-    public class MockEntities
+    public static class MockEntities
     {
-        public static IntPtr Ptr = IntPtr.Zero;
+        private static IntPtr _ptr = IntPtr.Zero;
 
-        public static ushort Id = 0;
+        private static ushort _id = 0;
 
-        public static IntPtr GetNextPtr()
+        public static IntPtr GetNextPtr(out ushort id)
         {
-            Ptr += 1;
-            Id++;
-            return Ptr;
+            _ptr += 1;
+            id = ++_id;
+            return _ptr;
+        }
+        
+        public static IntPtr GetNextPtrNoId()
+        {
+            _ptr += 1;
+            return _ptr;
         }
     }
 }

api/AltV.Net.Mock/MockServer.cs

@@ -183,31 +183,31 @@ public void TriggerClientEvent(IPlayer player, IntPtr eventNamePtr, ref MValue a
 
         public IVehicle CreateVehicle(uint model, Position pos, Rotation rotation)
         {
-            var ptr = MockEntities.GetNextPtr();
-            vehiclePool.Create(ptr, MockEntities.Id, out var vehicle);
+            var ptr = MockEntities.GetNextPtr(out var entityId);
+            vehiclePool.Create(ptr, entityId, out var vehicle);
             vehicle.Position = pos;
             if (vehicle is MockVehicle mockVehicle)
             {
                 mockVehicle.Position = pos;
                 mockVehicle.Rotation = rotation;
                 mockVehicle.Model = model;
             }
-            Alt.Module.OnCreateVehicle(ptr, MockEntities.Id);
+            Alt.Module.OnCreateVehicle(ptr, entityId);
             return vehicle;
         }
 
         public IntPtr CreateVehicleEntity(out ushort id, uint model, Position pos, Rotation rotation)
         {
-            var ptr = MockEntities.GetNextPtr();
-            id = MockEntities.Id;
-            Alt.Module.OnCreateVehicle(ptr, id);
+            var ptr = MockEntities.GetNextPtr(out var entityId);
+            id = entityId;
+            Alt.Module.OnCreateVehicle(ptr, entityId);
             return ptr;
         }
 
         public ICheckpoint CreateCheckpoint(IPlayer player, byte type, Position pos, float radius, float height,
             Rgba color)
         {
-            var ptr = MockEntities.GetNextPtr();
+            var ptr = MockEntities.GetNextPtrNoId();
             checkpointPool.Create(ptr, out var checkpoint);
             if (checkpoint is MockCheckpoint mockCheckpoint)
             {
@@ -223,7 +223,7 @@ public ICheckpoint CreateCheckpoint(IPlayer player, byte type, Position pos, flo
 
         public IBlip CreateBlip(IPlayer player, byte type, Position pos)
         {
-            var ptr = MockEntities.GetNextPtr();
+            var ptr = MockEntities.GetNextPtrNoId();
             blipPool.Create(ptr, out var blip);
             if (blip is MockBlip mockBlip)
             {
@@ -236,7 +236,7 @@ public IBlip CreateBlip(IPlayer player, byte type, Position pos)
 
         public IBlip CreateBlip(IPlayer player, byte type, IEntity entityAttach)
         {
-            var ptr = MockEntities.GetNextPtr();
+            var ptr = MockEntities.GetNextPtrNoId();
             blipPool.Create(ptr, out var blip);
             if (blip is MockBlip mockBlip)
             {
@@ -250,7 +250,7 @@ public IBlip CreateBlip(IPlayer player, byte type, IEntity entityAttach)
 
         public IVoiceChannel CreateVoiceChannel(bool spatial, float maxDistance)
         {
-            var ptr = MockEntities.GetNextPtr();
+            var ptr = MockEntities.GetNextPtrNoId();
             voiceChannelPool.Create(ptr, out var voiceChannel);
             if (voiceChannel is MockVoiceChannel mockVoiceChannel)
             {