Skip to content

Commit 7c77360

Browse files
committed
Reduce load on schedule calls in vehicle and player classes
1 parent c6cdeec commit 7c77360

File tree

6 files changed

+282
-88
lines changed

6 files changed

+282
-88
lines changed

src/AlternateLife.RageMP.Net/Elements/Entities/Player.Style.cs

+21-7
Original file line numberDiff line numberDiff line change
@@ -28,43 +28,57 @@ public async Task SetEyeColorAsync(uint value)
2828
{
2929
CheckExistence();
3030

31-
await _plugin.Schedule(() => Rage.Player.Player_SetEyeColor(NativePointer, value)).ConfigureAwait(false);
31+
await _plugin
32+
.Schedule(() => Rage.Player.Player_SetEyeColor(NativePointer, value))
33+
.ConfigureAwait(false);
3234
}
3335

3436
public async Task<uint> GetEyeColorAsync()
3537
{
3638
CheckExistence();
3739

38-
return await _plugin.Schedule(() => Rage.Player.Player_GetEyeColor(NativePointer)).ConfigureAwait(false);
40+
return await _plugin
41+
.Schedule(() => Rage.Player.Player_GetEyeColor(NativePointer))
42+
.ConfigureAwait(false);
3943
}
4044

4145
public async Task<uint> GetHairColorAsync()
4246
{
4347
CheckExistence();
4448

45-
return await _plugin.Schedule(() => Rage.Player.Player_GetHairColor(NativePointer)).ConfigureAwait(false);
49+
return await _plugin
50+
.Schedule(() => Rage.Player.Player_GetHairColor(NativePointer))
51+
.ConfigureAwait(false);
4652
}
4753

4854
public async Task<uint> GetHairHighlightColorAsync()
4955
{
5056
CheckExistence();
5157

52-
return await _plugin.Schedule(() => Rage.Player.Player_GetHairHighlightColor(NativePointer)).ConfigureAwait(false);
58+
return await _plugin
59+
.Schedule(() => Rage.Player.Player_GetHairHighlightColor(NativePointer))
60+
.ConfigureAwait(false);
5361
}
5462

5563
public async Task SetHeadBlendAsync(HeadBlendData value)
5664
{
5765
CheckExistence();
5866

59-
await _plugin.Schedule(() => Rage.Player.Player_SetHeadBlend(NativePointer, value.Shape[0], value.Shape[1], value.Shape[2],
60-
value.Skin[0], value.Skin[1], value.Skin[2], value.ShapeMix, value.SkinMix, value.ThirdMix)).ConfigureAwait(false);
67+
await _plugin
68+
.Schedule(() => Rage.Player.Player_SetHeadBlend(NativePointer, value.Shape[0], value.Shape[1], value.Shape[2],
69+
value.Skin[0], value.Skin[1], value.Skin[2], value.ShapeMix, value.SkinMix, value.ThirdMix))
70+
.ConfigureAwait(false);
6171
}
6272

6373
public async Task<HeadBlendData> GetHeadBlendAsync()
6474
{
6575
CheckExistence();
6676

67-
return await _plugin.Schedule(() => StructConverter.PointerToStruct<HeadBlendData>(Rage.Player.Player_GetHeadBlend(NativePointer))).ConfigureAwait(false);
77+
var headBlendPointer = await _plugin
78+
.Schedule(() => Rage.Player.Player_GetHeadBlend(NativePointer))
79+
.ConfigureAwait(false);
80+
81+
return StructConverter.PointerToStruct<HeadBlendData>(headBlendPointer);
6882
}
6983

7084
public async Task<ClothData> GetClothAsync(ClothSlot slot)

src/AlternateLife.RageMP.Net/Elements/Entities/Player.Vehicle.cs

+8-3
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,26 @@ public async Task<IVehicle> GetVehicleAsync()
1111
{
1212
CheckExistence();
1313

14-
var pointer = await _plugin.Schedule(() => Rage.Player.Player_GetVehicle(NativePointer)).ConfigureAwait(false);
14+
var pointer = await _plugin
15+
.Schedule(() => Rage.Player.Player_GetVehicle(NativePointer))
16+
.ConfigureAwait(false);
1517

1618
return _plugin.VehiclePool[pointer];
1719
}
1820

1921
public async Task<bool> IsInVehicleAsync()
2022
{
21-
return await GetVehicleAsync().ConfigureAwait(false) != null;
23+
return await GetVehicleAsync()
24+
.ConfigureAwait(false) != null;
2225
}
2326

2427
public async Task<int> GetSeatAsync()
2528
{
2629
CheckExistence();
2730

28-
return await _plugin.Schedule(() => Rage.Player.Player_GetSeat(NativePointer)).ConfigureAwait(false);
31+
return await _plugin
32+
.Schedule(() => Rage.Player.Player_GetSeat(NativePointer))
33+
.ConfigureAwait(false);
2934
}
3035

3136
public async Task PutIntoVehicleAsync(IVehicle vehicle, int seat)

src/AlternateLife.RageMP.Net/Elements/Entities/Player.Weapons.cs

+12-4
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,36 @@ public async Task SetCurrentWeaponAsync(uint value)
1515
{
1616
CheckExistence();
1717

18-
await _plugin.Schedule(() => Rage.Player.Player_SetCurrentWeapon(NativePointer, value)).ConfigureAwait(false);
18+
await _plugin
19+
.Schedule(() => Rage.Player.Player_SetCurrentWeapon(NativePointer, value))
20+
.ConfigureAwait(false);
1921
}
2022

2123
public async Task<uint> GetCurrentWeaponAsync()
2224
{
2325
CheckExistence();
2426

25-
return await _plugin.Schedule(() => Rage.Player.Player_GetCurrentWeapon(NativePointer)).ConfigureAwait(false);
27+
return await _plugin
28+
.Schedule(() => Rage.Player.Player_GetCurrentWeapon(NativePointer))
29+
.ConfigureAwait(false);
2630
}
2731

2832
public async Task SetCurrentWeaponAmmoAsync(uint value)
2933
{
3034
CheckExistence();
3135

32-
await _plugin.Schedule(() => Rage.Player.Player_SetCurrentWeaponAmmo(NativePointer, value)).ConfigureAwait(false);
36+
await _plugin
37+
.Schedule(() => Rage.Player.Player_SetCurrentWeaponAmmo(NativePointer, value))
38+
.ConfigureAwait(false);
3339
}
3440

3541
public async Task<uint> GetCurrentWeaponAmmoAsync()
3642
{
3743
CheckExistence();
3844

39-
return await _plugin.Schedule(() => Rage.Player.Player_GetCurrentWeaponAmmo(NativePointer)).ConfigureAwait(false);
45+
return await _plugin
46+
.Schedule(() => Rage.Player.Player_GetCurrentWeaponAmmo(NativePointer))
47+
.ConfigureAwait(false);
4048
}
4149

4250
public async Task<uint> GetWeaponAmmoAsync(WeaponHash weaponHash)

0 commit comments

Comments
 (0)