Security improvements

Author: FabianTerhorst

api/AltV.Net.Async/AltAsync.Vehicle.cs

@@ -11,15 +11,8 @@ namespace AltV.Net.Async
 {
     public static partial class AltAsync
     {
-        public static async Task<IVehicle> CreateVehicle(uint model, Position pos, Rotation rot)
-        {
-            ushort id = default;
-            var vehiclePtr = await AltVAsync.Schedule(() =>
-                AltNative.Server.Server_CreateVehicle(((Server) Alt.Server).NativePointer, model, pos, rot,
-                    ref id));
-            Alt.Module.VehiclePool.Create(vehiclePtr, id, out var vehicle);
-            return vehicle;
-        }
+        public static Task<IVehicle> CreateVehicle(uint model, Position pos, Rotation rot) => AltVAsync.Schedule(() =>
+            Alt.Module.Server.CreateVehicle(model, pos, rot));
 
         public static Task<IVehicle> CreateVehicle(VehicleModel model, Position pos, Rotation rot) =>
             CreateVehicle((uint) model, pos, rot);
@@ -36,14 +29,8 @@ public static IVehicleBuilder CreateVehicleBuilder(VehicleModel model, Position
         public static IVehicleBuilder CreateVehicleBuilder(string model, Position pos, Rotation rot) =>
             new VehicleBuilder(Alt.Hash(model), pos, rot);
 
-        public static async Task<IPlayer> GetDriverAsync(this IVehicle vehicle)
-        {
-            var entityPointer =
-                await AltVAsync.Schedule(() =>
-                    !vehicle.Exists ? IntPtr.Zero : AltNative.Vehicle.Vehicle_GetDriver(vehicle.NativePointer));
-            if (entityPointer == IntPtr.Zero) return null;
-            return Alt.Module.PlayerPool.GetOrCreate(entityPointer, out var player) ? player : null;
-        }
+        public static Task<IPlayer> GetDriverAsync(this IVehicle vehicle) => AltVAsync.Schedule(() =>
+            !vehicle.Exists ? null : vehicle.Driver);
 
         public static Task<byte> GetModKitAsync(this IVehicle vehicle) =>
             AltVAsync.Schedule(() => vehicle.ModKit);
@@ -235,22 +222,22 @@ public static Task<bool> IsRoofOpenAsync(this IVehicle vehicle) =>
 
         public static Task SetRoofOpenAsync(this IVehicle vehicle, bool roofOpen) =>
             AltVAsync.Schedule(() => vehicle.RoofOpened = roofOpen);
-        
+
         public static Task<byte> GetDoorStateAsync(this IVehicle vehicle, byte doorId) =>
             AltVAsync.Schedule(() => vehicle.GetDoorState(doorId));
-        
+
         public static Task SetDoorStateAsync(this IVehicle vehicle, byte doorId, byte state) =>
             AltVAsync.Schedule(() => vehicle.SetDoorState(doorId, state));
-        
+
         public static Task<VehicleDoorState> GetDoorStateAsync(this IVehicle vehicle, VehicleDoor door) =>
             AltVAsync.Schedule(() => vehicle.GetDoorState(door));
-        
+
         public static Task SetDoorStateAsync(this IVehicle vehicle, VehicleDoor door, VehicleDoorState state) =>
             AltVAsync.Schedule(() => vehicle.SetDoorState(door, state));
-        
+
         public static Task<bool> IsWindowOpenedAsync(this IVehicle vehicle, byte windowId) =>
             AltVAsync.Schedule(() => vehicle.IsWindowOpened(windowId));
-        
+
         public static Task SetWindowOpenedAsync(this IVehicle vehicle, byte windowId, bool state) =>
             AltVAsync.Schedule(() => vehicle.SetWindowOpened(windowId, state));
 
@@ -286,19 +273,19 @@ public static Task<bool> IsFlamethrowerActiveAsync(this IVehicle vehicle) =>
 
         public static Task<bool> HasArmoredWindowsAsync(this IVehicle vehicle) =>
             AltVAsync.Schedule(() => vehicle.HasArmoredWindows);
-        
+
         public static Task SetSpecialLightDamaged(this IVehicle vehicle, byte specialLightId, bool isDamaged) =>
             AltVAsync.Schedule(() => vehicle.SetSpecialLightDamaged(specialLightId, isDamaged));
-        
+
         public static Task<bool> IsSpecialLightDamaged(this IVehicle vehicle, byte specialLightId) =>
             AltVAsync.Schedule(() => vehicle.IsSpecialLightDamaged(specialLightId));
-        
+
         public static Task SetWindowDamaged(this IVehicle vehicle, byte windowId, bool isDamaged) =>
             AltVAsync.Schedule(() => vehicle.SetWindowDamaged(windowId, isDamaged));
-        
+
         public static Task<bool> IsWindowDamaged(this IVehicle vehicle, byte windowId) =>
             AltVAsync.Schedule(() => vehicle.IsWindowDamaged(windowId));
-        
+
         // TODO: Add: SetLightDamaged, IsLightDamaged, SetPartBulletHoles, GetPartBulletHoles, SetPartDamageLevel, GetPartDamageLevel
         // TODO: GetArmoredWindowHealth, SetArmoredWindowHealth, GetArmoredWindowShootCount, SetArmoredWindowShootCount
         // TODO: GetBumperDamageLevel, SetBumperDamageLevel
@@ -341,31 +328,31 @@ public static Task<Tuple<bool, bool, bool, bool>> GetNeonActiveAsync(this IVehic
         public static Task
             SetNeonActiveAsync(this IVehicle vehicle, bool left, bool right, bool front, bool back) =>
             AltVAsync.Schedule(() => vehicle.SetNeonActive(left, right, front, back));
-        
+
         public static Task<string> GetAppearanceDataAsync(this IVehicle vehicle) =>
             AltVAsync.Schedule(() => vehicle.AppearanceData);
 
         public static Task SetAppearanceDataAsync(this IVehicle vehicle, string text) =>
             AltVAsync.Schedule(() => vehicle.AppearanceData = text);
-        
+
         public static Task<uint> GetRadioStationAsync(this IVehicle vehicle) =>
             AltVAsync.Schedule(() => vehicle.RadioStation);
 
         public static Task SetRadioStationAsync(this IVehicle vehicle, uint radioStation) =>
             AltVAsync.Schedule(() => vehicle.RadioStation = radioStation);
-        
+
         public static Task<bool> GetManualEngineControlAsync(this IVehicle vehicle) =>
             AltVAsync.Schedule(() => vehicle.ManualEngineControl);
 
         public static Task SetManualEngineControlAsync(this IVehicle vehicle, bool state) =>
             AltVAsync.Schedule(() => vehicle.ManualEngineControl = state);
-        
+
         public static Task<string> GetScriptDataAsync(this IVehicle vehicle) =>
             AltVAsync.Schedule(() => vehicle.ScriptData);
 
         public static Task SetScriptDataAsync(this IVehicle vehicle, string text) =>
             AltVAsync.Schedule(() => vehicle.ScriptData = text);
-        
+
         public static Task RemoveAsync(this IVehicle vehicle) => AltVAsync.Schedule(vehicle.Remove);
     }
 }

api/AltV.Net.Example/SampleResource.cs

@@ -28,10 +28,6 @@ public override void OnStart()
             var convertibleObject = new ConvertibleObject();
             Alt.Emit("convertible_test", convertibleObject);
 
-            Alt.CreateColShapeCircle(new Position(0, 0, 0), 1);
-
-            Alt.OnColShape += (shape, entity, state) => { };
-
             Alt.On<string>("test", s => { Alt.Log("test=" + s); });
             Alt.OnServer("test", args => { Alt.Log("args=" + args[0]); });
             Alt.Emit("test", "bla");
@@ -58,6 +54,15 @@ public override void OnStart()
                 async args => { await AltAsync.Do(() => Alt.Log("bla with no args:" + args.Length)); });
             Alt.Emit("bla");
 
+            var blip = Alt.CreateBlip(BlipType.Area, Position.Zero);
+            blip.Color = 1;
+
+            var checkpoint = Alt.CreateCheckpoint(CheckpointType.Cyclinder, Position.Zero, 1f, 1f, Rgba.Zero);
+            Alt.Log(checkpoint.Color.ToString());
+
+            var voiceChannel = Alt.CreateVoiceChannel(true, 10f);
+            Alt.Log(voiceChannel.MaxDistance.ToString());
+
             var vehicle = Alt.CreateVehicle(VehicleModel.Apc, new Position(1, 2, 3), new Rotation(1, 2, 3));
             Alt.Log(vehicle.Position.ToString());
             vehicle.PrimaryColor = 7;
@@ -248,22 +253,37 @@ async delegate(string s, string s1, long i1, string[] arg3, object[] arg4, IMyVe
             catch (BaseObjectRemovedException baseObjectRemovedException)
             {
             }
-            
+
             Alt.RegisterEvents(this);
-            
+
             Alt.Emit("bla2", "bla");
-            
+
             AltAsync.RegisterEvents(this);
-            
+
             Alt.Emit("asyncBla3", "bla");
+            Alt.OnColShape += (shape, entity, state) =>
+            {
+                Console.WriteLine("collision shape test:" + shape + " " + shape.GetData("bla", out int id1) + " " + id1);
+                Console.WriteLine(" " + shape + " " + shape.GetMetaData("bla", out long id2) + " " + id2 + " " + entity + " " + state);
+            };
+            
+            var colShapeCylinder = Alt.CreateColShapeCylinder(new Position(1337, 1337, 1337), 10, 10);
+            colShapeCylinder.SetMetaData("bla", 1);
+            colShapeCylinder.SetData("bla", (int) 2);
+            
+            var colShapeCircle = Alt.CreateColShapeCircle(new Position(1337, 1337, 1337), 10);
+            colShapeCircle.SetMetaData("bla", 3);
+            colShapeCircle.SetData("bla", (int) 4);
+
+            Alt.CreateVehicle(VehicleModel.Adder, new Position(1337, 1337, 1337), Rotation.Zero);
         }
-        
+
         [Event("bla2")]
         public void MyServerEventHandler2(string myString)
         {
             Alt.Log(myString);
         }
-        
+
         [AsyncEvent]
         public void asyncBla3(string myString)
         {

api/AltV.Net.NetworkingEntity/EntityStreamer.cs

@@ -1,8 +1,6 @@
-using System;
 using AltV.Net.NetworkingEntity.Elements.Entities;
 using Entity;
 using Google.Protobuf;
-using net.vieapps.Components.Utility;
 
 namespace AltV.Net.NetworkingEntity
 {

api/AltV.Net/Server.cs

@@ -221,74 +221,69 @@ public void TriggerClientEvent(IPlayer player, string eventName, params object[]
         public IVehicle CreateVehicle(uint model, Position pos, Rotation rotation)
         {
             ushort id = default;
-            vehiclePool.Create(AltNative.Server.Server_CreateVehicle(NativePointer, model, pos, rotation, ref id), id,
-                out var vehicle);
-            return vehicle;
+            var ptr = AltNative.Server.Server_CreateVehicle(NativePointer, model, pos, rotation, ref id);
+            return vehiclePool.Get(ptr, out var vehicle) ? vehicle : null;
         }
 
         public ICheckpoint CreateCheckpoint(IPlayer player, byte type, Position pos, float radius, float height,
             Rgba color)
         {
-            checkpointPool.Create(AltNative.Server.Server_CreateCheckpoint(NativePointer,
+            var ptr = AltNative.Server.Server_CreateCheckpoint(NativePointer,
                 player?.NativePointer ?? IntPtr.Zero,
-                type, pos, radius, height, color), out var checkpoint);
-            return checkpoint;
+                type, pos, radius, height, color);
+            return checkpointPool.Get(ptr, out var checkpoint) ? checkpoint : null;
         }
 
         public IBlip CreateBlip(IPlayer player, byte type, Position pos)
         {
-            blipPool.Create(AltNative.Server.Server_CreateBlip(NativePointer, player?.NativePointer ?? IntPtr.Zero,
-                type, pos), out var blip);
-            return blip;
+            var ptr = AltNative.Server.Server_CreateBlip(NativePointer, player?.NativePointer ?? IntPtr.Zero,
+                type, pos);
+            return blipPool.Get(ptr, out var blip) ? blip : null;
         }
 
         public IBlip CreateBlip(IPlayer player, byte type, IEntity entityAttach)
         {
-            blipPool.Create(AltNative.Server.Server_CreateBlipAttached(NativePointer,
+            var ptr = AltNative.Server.Server_CreateBlipAttached(NativePointer,
                 player?.NativePointer ?? IntPtr.Zero,
-                type, entityAttach.NativePointer), out var blip);
-            return blip;
+                type, entityAttach.NativePointer);
+            return blipPool.Get(ptr, out var blip) ? blip : null;
         }
 
         public IVoiceChannel CreateVoiceChannel(bool spatial, float maxDistance)
         {
-            voiceChannelPool.Create(AltNative.Server.Server_CreateVoiceChannel(NativePointer,
-                spatial, maxDistance), out var voiceChannel);
-            return voiceChannel;
+            var ptr = AltNative.Server.Server_CreateVoiceChannel(NativePointer,
+                spatial, maxDistance);
+            return voiceChannelPool.Get(ptr, out var voiceChannel) ? voiceChannel : null;
         }
 
         public IColShape CreateColShapeCylinder(Position pos, float radius, float height)
         {
-            colShapePool.Create(AltNative.Server.Server_CreateColShapeCylinder(NativePointer, pos, radius, height),
-                out var colShape);
-            return colShape;
+            var ptr = AltNative.Server.Server_CreateColShapeCylinder(NativePointer, pos, radius, height);
+            return colShapePool.Get(ptr, out var colShape) ? colShape : null;
         }
 
         public IColShape CreateColShapeSphere(Position pos, float radius)
         {
-            colShapePool.Create(AltNative.Server.Server_CreateColShapeSphere(NativePointer, pos, radius),
-                out var colShape);
-            return colShape;
+            var ptr = AltNative.Server.Server_CreateColShapeSphere(NativePointer, pos, radius);
+            return colShapePool.Get(ptr, out var colShape) ? colShape : null;
         }
 
         public IColShape CreateColShapeCircle(Position pos, float radius)
         {
-            colShapePool.Create(AltNative.Server.Server_CreateColShapeCircle(NativePointer, pos, radius),
-                out var colShape);
-            return colShape;
+            var ptr = AltNative.Server.Server_CreateColShapeCircle(NativePointer, pos, radius);
+            return colShapePool.Get(ptr, out var colShape) ? colShape : null;
         }
 
         public IColShape CreateColShapeCube(Position pos, Position pos2)
         {
-            colShapePool.Create(AltNative.Server.Server_CreateColShapeCube(NativePointer, pos, pos2), out var colShape);
-            return colShape;
+            var ptr = AltNative.Server.Server_CreateColShapeCube(NativePointer, pos, pos2);
+            return colShapePool.Get(ptr, out var colShape) ? colShape : null;
         }
 
         public IColShape CreateColShapeRectangle(Position pos, Position pos2)
         {
-            colShapePool.Create(AltNative.Server.Server_CreateColShapeRectangle(NativePointer, pos, pos2),
-                out var colShape);
-            return colShape;
+            var ptr = AltNative.Server.Server_CreateColShapeRectangle(NativePointer, pos, pos2);
+            return colShapePool.Get(ptr, out var colShape) ? colShape : null;
         }
 
         public void RemoveBlip(IBlip blip)