aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/points' into develop

Browse Source
This commit is contained in:
hydrant
2021-04-15 14:17:00 +02:00
parent ab7f5465db d2c493655f
commit 04e82ac6da
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ReallifeGamemode.Server/Commands/FactionCommands.cs
View File

@@ -356,15 +356,15 @@ namespace ReallifeGamemode.Server.Commands
public void CmdFactionMedicHealive(Player player, string receiver, int price = 10)
{
Player target = PlayerService.GetPlayerByNameOrId(receiver);
if (player.GetUser()?.FactionId != 2)
if(target == null || !target.IsLoggedIn())
{
ChatService.NotAuthorized(player);
ChatService.PlayerNotFound(player);
return;
}
if (player.Position.DistanceTo(target.Position) > 5)
if (player.GetUser()?.FactionId != 2)
{
ChatService.ErrorMessage(player, "Der Patient ist zu weit entfernt");
ChatService.NotAuthorized(player);
return;
}
@@ -391,6 +391,12 @@ namespace ReallifeGamemode.Server.Commands
return;
}
if (player.Position.DistanceTo(target.Position) > 5)
{
ChatService.ErrorMessage(player, "Der Patient ist zu weit entfernt");
return;
}
if (target.Health == 100)
{
ChatService.ErrorMessage(player, "Der Spieler ist bereits voll geheilt");