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

Fix Sani 5

Browse Source
This commit is contained in:
VegaZ
2021-04-05 17:22:24 +02:00
parent cc24be5e09
commit 06dcdb64b4
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Client/Player/keys.ts
View File

@@ -113,9 +113,7 @@ export default function keys(globalData: IGlobalData) {
//N //Motor Starten //N //Motor Starten
mp.keys.bind(0x4E, false, function () { mp.keys.bind(0x4E, false, function () {
if (!globalData.InChat) { if (!globalData.InChat) {
if (!player.vehicle) return; mp.events.callRemote("keyPress:N", player.vehicle.getSpeed());
if (player.vehicle.getSpeed() > 5) return;
mp.events.callRemote("keyPress:N");
} }
}); });

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

@@ -390,9 +390,9 @@ namespace ReallifeGamemode.Server.Commands
ChatService.ErrorMessage(player, "Der Spieler ist bereits voll geheilt"); ChatService.ErrorMessage(player, "Der Spieler ist bereits voll geheilt");
return; 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(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");
ChatService.SendMessage(player, "Du hast " + target.Name + " einen Heal angeboten"); player.SendNotification("Du hast " + target.Name + " einen Heal angeboten",false);
target.SetData<bool>("healDecision", true); target.SetData<bool>("healDecision", true);
Medic.HealDecisions.Add(new Medic.HealDecision {dMedic = player, dTarget = target, dPrice = price}); Medic.HealDecisions.Add(new Medic.HealDecision {dMedic = player, dTarget = target, dPrice = price});
} }

3
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -760,7 +760,7 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("keyPress:N")] [RemoteEvent("keyPress:N")]
public void KeyPressN(Player player) public void KeyPressN(Player player, int vSpeed)
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
@@ -772,6 +772,7 @@ namespace ReallifeGamemode.Server.Events
if (!player.IsInVehicle) return; if (!player.IsInVehicle) return;
if (player.VehicleSeat != 0) return; if (player.VehicleSeat != 0) return;
if (vSpeed > 5) return;
GTANetworkAPI.Vehicle v = player.Vehicle; GTANetworkAPI.Vehicle v = player.Vehicle;

4
ReallifeGamemode.Server/Factions/Medic/Medic.cs
View File

@@ -86,12 +86,12 @@ namespace ReallifeGamemode.Server.Factions.Medic
var activeDecision = HealDecisions.FirstOrDefault(d => d.dTarget == target); var activeDecision = HealDecisions.FirstOrDefault(d => d.dTarget == target);
if(decision == false) 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; return;
} }
else 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(); using var dbContext = new DatabaseContext();
{ {
User targetUser = target.GetUser(dbContext); User targetUser = target.GetUser(dbContext);