diff --git a/ReallifeGamemode.Client/Gui/infobox.ts b/ReallifeGamemode.Client/Gui/infobox.ts index 9e0ef561..6dacfcd8 100644 --- a/ReallifeGamemode.Client/Gui/infobox.ts +++ b/ReallifeGamemode.Client/Gui/infobox.ts @@ -59,6 +59,9 @@ export default function (globalData: GlobalData): void { }); mp.events.add("toggleDutyMode", (toggle) => { + if (toggle != 0) { + + } dutyMode = toggle; }); @@ -216,7 +219,7 @@ export default function (globalData: GlobalData): void { }) if (jailTime > 0) { - mp.game.graphics.drawText("~y~Knastzeit: (" + jailTime + ")", [0.89, 0.441], + mp.game.graphics.drawText("~y~Knastzeit: " + jailTime + " Minuten", [0.9, 0.55], { font: 4, color: [255, 255, 255, 255], diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs index 74e17c6e..424c50c7 100644 --- a/ReallifeGamemode.Server/Wanted/Jail.cs +++ b/ReallifeGamemode.Server/Wanted/Jail.cs @@ -76,7 +76,7 @@ namespace ReallifeGamemode.Server.Wanted Medic.RemoveTaskFromList(task); client.Health = 100; - client.TriggerEvent("jailTime", jailTime); + client.TriggerEvent("jailTime", (int)(jailTime / 60)); ChatService.SendMessage(client, "!{#FF614A}* Du bist nun im Gefängnis für " + jailTime + " Sekunden."); ChatService.BroadcastFaction("!{#8181E9}HQ: " + user.Name + " wurde ins Gefängnis geliefert.", new List() { 1, 3 }); } @@ -166,6 +166,7 @@ namespace ReallifeGamemode.Server.Wanted using (var dbContext = new DatabaseContext()) { player.GetUser(dbContext).JailTime -= 60; + player.TriggerEvent("jailTime", (int)(player.GetUser(dbContext).JailTime / 60)); dbContext.SaveChanges(); } player.Health = 100;