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

Fix Sani-!SelfHeal, Fix Duty = 0 wenn Uninvite

Browse Source
This commit is contained in:
Mac_Slash
2020-04-13 14:17:17 +02:00
parent 28033a5175
commit 941e266381
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -1594,8 +1594,10 @@ namespace ReallifeGamemode.Server.Commands
ChatService.ErrorMessage(player, "Du musst Fahrer sein, um das Menü zu öffnen");
return;
}
player.TriggerEvent("showTuningMenu");
else
{
player.TriggerEvent("showTuningMenu");
}
}
#endregion

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

@@ -187,7 +187,7 @@ namespace ReallifeGamemode.Server.Commands
}
if (player.IsInVehicle)
{
ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht wiederbeleben");
ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht wiederbeleben.");
return;
}
@@ -196,7 +196,7 @@ namespace ReallifeGamemode.Server.Commands
var deadPlayer = nearPlayers.Where(i => i.GetData<bool>("isDead") == true).FirstOrDefault();
if (player == deadPlayer)
{
ChatService.ErrorMessage(player, "Du kannst dich nicht selbst wiederbeleben");
ChatService.ErrorMessage(player, "Du kannst dich nicht selbst wiederbeleben.");
return;
}
@@ -233,6 +233,7 @@ namespace ReallifeGamemode.Server.Commands
[Command("heal", "~m~Benutzung: ~s~/heal [Spieler]")] //TODO Eventuell noch mit Geldbetrag wie bei SA:MP
public void CmdFactionMedicHealive(Player player, string receiver)
{
Player target = PlayerService.GetPlayerByNameOrId(receiver);
if (player.GetUser()?.FactionId == null || player.GetUser().FactionId != 2)
{
ChatService.NotAuthorized(player);
@@ -240,10 +241,14 @@ namespace ReallifeGamemode.Server.Commands
}
if (player.IsInVehicle)
{
ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht heilen");
ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht heilen.");
return;
}
if(player == target)
{
ChatService.ErrorMessage(player, "Du kannst dich nicht selbst heilen.");
return;
}
Player target = PlayerService.GetPlayerByNameOrId(receiver);
target.Health = 100;
target.SendNotification("Du wurdest von ~g~" + player.Name + " ~s~geheilt.", false);
player.SendNotification("Du hast ~g~" + target.Name + " ~s~geheilt.", false);

2
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -269,7 +269,7 @@ namespace ReallifeGamemode.Server.Managers
target.GetUser(dbContext).FactionRankId = null;
target.GetUser(dbContext).FactionId = null;
target.SetData<bool>("duty", false);
ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " aus der Fraktion geworfen.");
ChatService.SendMessage(target, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");
target.SetSharedData("blipColor", 0);