Skip to content

Commit 8fc2a62

Browse files
committed
fix(client): OnPlayerEnterVehicle for LocalVehicle
1 parent 68aa112 commit 8fc2a62

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

api/AltV.Net.Client/Core.Events.cs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,12 @@ public void OnPlayerEnterVehicle(IntPtr pointer, byte seat)
254254
var vehicle = PoolManager.Vehicle.Get(pointer);
255255
if (vehicle is null)
256256
{
257-
Console.WriteLine("Invalid vehicle: " + pointer);
258-
return;
257+
vehicle = PoolManager.LocalVehicle.Get(pointer);
258+
if (vehicle is null)
259+
{
260+
Console.WriteLine("Invalid vehicle: " + pointer);
261+
return;
262+
}
259263
}
260264

261265
EnterVehicleEventHandler.GetEvents().ForEachCatching(fn => fn(vehicle, seat), $"event {nameof(OnPlayerEnterVehicle)}");
@@ -478,6 +482,16 @@ public void OnRemoveEntity(IntPtr targetPtr, BaseObjectType type)
478482
public void OnPlayerLeaveVehicle(IntPtr vehiclePtr, byte seat)
479483
{
480484
var vehicle = PoolManager.Vehicle.Get(vehiclePtr);
485+
if (vehicle is null)
486+
{
487+
vehicle = PoolManager.LocalVehicle.Get(vehiclePtr);
488+
if (vehicle is null)
489+
{
490+
Console.WriteLine("Invalid vehicle: " + vehiclePtr);
491+
return;
492+
}
493+
}
494+
481495
PlayerLeaveVehicleEventHandler.GetEvents().ForEachCatching(fn => fn(vehicle, seat), $"event {nameof(OnPlayerLeaveVehicle)}");
482496
}
483497

0 commit comments

Comments
 (0)