diff --git a/ReallifeGamemode.Client/Player/keys.ts b/ReallifeGamemode.Client/Player/keys.ts index 09d81158..f2b84b59 100644 --- a/ReallifeGamemode.Client/Player/keys.ts +++ b/ReallifeGamemode.Client/Player/keys.ts @@ -113,9 +113,7 @@ export default function keys(globalData: IGlobalData) { //N //Motor Starten mp.keys.bind(0x4E, false, function () { if (!globalData.InChat) { - if (!player.vehicle) return; - if (player.vehicle.getSpeed() > 5) return; - mp.events.callRemote("keyPress:N"); + mp.events.callRemote("keyPress:N", player.vehicle.getSpeed()); } }); diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs index 501bf960..437b8dae 100644 --- a/ReallifeGamemode.Server/Commands/FactionCommands.cs +++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs @@ -390,9 +390,9 @@ namespace ReallifeGamemode.Server.Commands ChatService.ErrorMessage(player, "Der Spieler ist bereits voll geheilt"); return; } - var medicName = player.GetUser(); - ChatService.SendMessage(target,"~g~" + medicName + " ~s~möchte dich für ~g~$" + price + " ~s~heilen. Drücke ~g~J~s~ zum Erlauben oder ~r~N ~s~zum Verbieten"); - ChatService.SendMessage(player, "Du hast " + target.Name + " einen Heal angeboten"); + + ChatService.SendMessage(target,"~g~" + player.Name + " ~s~möchte dich für ~g~$" + price + " ~s~heilen. Drücke ~g~J~s~ zum Erlauben oder ~r~N ~s~zum Verbieten"); + player.SendNotification("Du hast " + target.Name + " einen Heal angeboten",false); target.SetData("healDecision", true); Medic.HealDecisions.Add(new Medic.HealDecision {dMedic = player, dTarget = target, dPrice = price}); } diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 22c81296..2591ed2a 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -760,7 +760,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("keyPress:N")] - public void KeyPressN(Player player) + public void KeyPressN(Player player, int vSpeed) { if (!player.IsLoggedIn()) return; @@ -772,6 +772,7 @@ namespace ReallifeGamemode.Server.Events if (!player.IsInVehicle) return; if (player.VehicleSeat != 0) return; + if (vSpeed > 5) return; GTANetworkAPI.Vehicle v = player.Vehicle; diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index d89bba21..c296676f 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -86,12 +86,12 @@ namespace ReallifeGamemode.Server.Factions.Medic var activeDecision = HealDecisions.FirstOrDefault(d => d.dTarget == target); if(decision == false) { - ChatService.SendMessage(activeDecision.dMedic, activeDecision.dTarget.Name + " hat den Heal abgelehnt"); + activeDecision.dMedic.SendNotification(activeDecision.dTarget.Name + " hat den Heal ~r~abgelehnt",false); return; } else { - ChatService.SendMessage(activeDecision.dMedic, activeDecision.dTarget.Name + " hat den Heal akzeptiert"); + activeDecision.dMedic.SendNotification(activeDecision.dTarget.Name + " hat den Heal ~g~akzeptiert", false); using var dbContext = new DatabaseContext(); { User targetUser = target.GetUser(dbContext);