Skip to content

Commit 1a65cf6

Browse files
committed
Merge branch 'dev' into rc
2 parents 80c32ce + 41fd591 commit 1a65cf6

File tree

19 files changed

+3
-672
lines changed

19 files changed

+3
-672
lines changed

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,6 @@ public static Task<IVehicle> CreateVehicle(VehicleModel model, Position pos, Rot
2222
public static Task<IVehicle> CreateVehicle(string model, Position pos, Rotation rot, uint streamingDistance = 0) =>
2323
CreateVehicle(Alt.Hash(model), pos, rot, streamingDistance);
2424

25-
[Obsolete("Use AltAsync.CreateVehicle or Alt.CreateVehicle instead")]
26-
public static IVehicleBuilder CreateVehicleBuilder(uint model, Position pos, Rotation rot) =>
27-
new VehicleBuilder(model, pos, rot);
28-
29-
[Obsolete("Use AltAsync.CreateVehicle or Alt.CreateVehicle instead")]
30-
public static IVehicleBuilder CreateVehicleBuilder(VehicleModel model, Position pos, Rotation rot) =>
31-
new VehicleBuilder((uint) model, pos, rot);
32-
33-
[Obsolete("Use AltAsync.CreateVehicle or Alt.CreateVehicle instead")]
34-
public static IVehicleBuilder CreateVehicleBuilder(string model, Position pos, Rotation rot) =>
35-
new VehicleBuilder(Alt.Hash(model), pos, rot);
36-
3725
[Obsolete("Use async entities instead")]
3826
public static Task<IPlayer> GetDriverAsync(this IVehicle vehicle) => AltVAsync.Schedule(() =>
3927
!vehicle.Exists ? null : vehicle.Driver);

api/AltV.Net.Async/Elements/Entities/AsyncBaseObject.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,6 @@ public void OnDestroy()
222222
BaseObject.OnDestroy();
223223
}
224224

225-
[Obsolete("Use Destroy() instead")]
226-
public void Remove() => Destroy();
227-
228225
public void Destroy()
229226
{
230227
AsyncContext.RunOnMainThreadBlockingNullable(() => BaseObject.Destroy());

api/AltV.Net.Async/Elements/Entities/AsyncVehicle.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -585,13 +585,6 @@ public AsyncVehicle(ICore core, IntPtr nativePointer, uint id) : this(new Vehicl
585585
{
586586
}
587587

588-
[Obsolete("Use AltAsync.CreateVehicle instead")]
589-
public AsyncVehicle(ICore core, uint model, Position position, Rotation rotation, uint streamingDistance = 0) : this(
590-
core, core.CreateVehicleEntity(out var id, model, position, rotation, streamingDistance), id)
591-
{
592-
core.PoolManager.Vehicle.Add(this);
593-
}
594-
595588
public byte GetMod(byte category)
596589
{
597590
lock (Vehicle)

0 commit comments

Comments
 (0)