Skip to content

Commit 59a7cbf

Browse files
committed
Fix async errors in example resource and commands
1 parent 4811875 commit 59a7cbf

File tree

7 files changed

+15
-21
lines changed

7 files changed

+15
-21
lines changed

src/AlternateLife.RageMP.Net.Example/Server/CommandHandler.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class CommandHandler : ICommandHandler
1212
[Command("vehicle")]
1313
public async Task Vehicle(IPlayer player, VehicleHash vehicleName)
1414
{
15-
var vehicle = await MP.Vehicles.NewAsync(vehicleName, player.Position);
15+
var vehicle = await MP.Vehicles.NewAsync(vehicleName, await player.GetPositionAsync());
1616

1717
player.PutIntoVehicle(vehicle, -1);
1818

@@ -48,7 +48,7 @@ public async Task PrintArguments(IPlayer player, string[] arguments)
4848
return;
4949
}
5050

51-
player.Model = result;
51+
await player.SetModelAsync(result);
5252

5353
await player.OutputChatBoxAsync($"Skin changed to \"{result}\"!");
5454
}

src/AlternateLife.RageMP.Net.Example/Server/ExampleResource.cs

+7-13
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,21 @@ public Task OnStopAsync()
3333
return Task.CompletedTask;
3434
}
3535

36-
private Task OnPlayerJoin(IPlayer player)
36+
private async Task OnPlayerJoin(IPlayer player)
3737
{
38-
MP.Logger.Info($"Player {player.SocialClubName} ({player.Ip}) joined!");
39-
40-
return Task.CompletedTask;
38+
MP.Logger.Info($"Player {await player.GetSocialClubNameAsync()} ({await player.GetIpAsync()}) joined!");
4139
}
4240

43-
private Task OnPlayerReady(IPlayer player)
41+
private async Task OnPlayerReady(IPlayer player)
4442
{
45-
player.Dimension = MP.GlobalDimension;
46-
47-
MP.Logger.Info($"Player {player.SocialClubName} ({player.Ip}) is ready now.");
43+
await player.SetDimensionAsync(MP.GlobalDimension);
4844

49-
return Task.CompletedTask;
45+
MP.Logger.Info($"Player {await player.GetSocialClubNameAsync()} ({await player.GetIpAsync()}) is ready now.");
5046
}
5147

52-
private Task OnPlayerDeath(IPlayer player, uint reason, IPlayer killerplayer)
48+
private async Task OnPlayerDeath(IPlayer player, uint reason, IPlayer killerplayer)
5349
{
54-
player.Spawn(player.Position, player.Heading);
55-
56-
return Task.CompletedTask;
50+
player.Spawn(await player.GetPositionAsync(), await player.GetHeadingAsync());
5751
}
5852
}
5953
}

src/AlternateLife.RageMP.Net/Elements/Entities/Blip.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public async Task<float> GetDrawDistanceAsync()
2929
return await _plugin.Schedule(() => Rage.Blip.Blip_GetDrawDistance(NativePointer)).ConfigureAwait(false);
3030
}
3131

32-
public new async Task SetRotationAsync(int value)
32+
public async Task SetRotationAsync(int value)
3333
{
3434
CheckExistence();
3535

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace AlternateLife.RageMP.Net.Elements.Entities
1010
{
1111
internal partial class Player
1212
{
13-
public new async Task SetModelAsync(PedHash value)
13+
public async Task SetModelAsync(PedHash value)
1414
{
1515
CheckExistence();
1616

src/AlternateLife.RageMP.Net/Interfaces/IBlip.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public interface IBlip : IEntity
2626
/// </summary>
2727
/// <param name="rotation">New rotation of the blip</param>
2828
/// <exception cref="EntityDeletedException">This entity was deleted before</exception>
29-
new Task SetRotationAsync(int rotation);
29+
Task SetRotationAsync(int rotation);
3030

3131
/// <summary>
3232
/// Get the rotation of the blip.

src/AlternateLife.RageMP.Net/Interfaces/IPlayer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public interface IPlayer : IEntity
8989
/// </summary>
9090
/// <param name="model">New model of the player</param>
9191
/// <exception cref="EntityDeletedException">This entity was deleted before</exception>
92-
new Task SetModelAsync(PedHash model);
92+
Task SetModelAsync(PedHash model);
9393

9494
/// <summary>
9595
/// Get the model of the player.

src/AlternateLife.RageMP.Net/Scripting/ScriptingClasses/Commands.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ private async Task ExecuteReflectionCommand(IPlayer player, ReflectionCommand re
230230
}
231231
catch (Exception e)
232232
{
233-
_logger.Error($"An error occured when player {player.Name} executed command: {reflectionCommand.Name}: ", e);
233+
_logger.Error($"An error occured when player {await player.GetNameAsync()} executed command: {reflectionCommand.Name}: ", e);
234234
}
235235
}
236236

@@ -242,7 +242,7 @@ private async Task ExecuteDelegateCommand(IPlayer player, DelegateCommand delega
242242
}
243243
catch (Exception e)
244244
{
245-
_logger.Error($"An error occured when player {player.Name} executed command: {delegateCommand.Name}: ", e);
245+
_logger.Error($"An error occured when player {await player.GetNameAsync()} executed command: {delegateCommand.Name}: ", e);
246246
}
247247
}
248248

0 commit comments

Comments
 (0)