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

fixes in jailtime

Browse Source
This commit is contained in:
Fabian Fabian
2019-09-05 21:14:33 +02:00
parent 5dc08f73c4
commit 56a12a2c5c
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Client/Gui/infobox.ts
View File

@@ -216,7 +216,7 @@ export default function (globalData: GlobalData): void {
}) })
if (jailTime > 0) { if (jailTime > 0) {
mp.game.graphics.drawText("~y~Knastzeit: " + jailTime + " Minuten", [0.9, 0.55], mp.game.graphics.drawText("~y~Knastzeit: " + jailTime + " Minuten", [0.92, 0.52],
{ {
font: 4, font: 4,
color: [255, 255, 255, 255], color: [255, 255, 255, 255],

25
ReallifeGamemode.Server/Wanted/Jail.cs
View File

@@ -76,7 +76,18 @@ namespace ReallifeGamemode.Server.Wanted
Medic.RemoveTaskFromList(task); Medic.RemoveTaskFromList(task);
client.Health = 100; client.Health = 100;
client.TriggerEvent("jailTime", (int)(jailTime / 60)); int t = 0;
if (((int)(user.JailTime / 60)) == 0)
{
t = 1;
}
else
{
t = (int)(user.JailTime / 60);
}
client.TriggerEvent("jailTime", t);
ChatService.SendMessage(client, "!{#FF614A}* Du bist nun im Gefängnis für " + jailTime + " Sekunden."); 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<int>() { 1, 3 }); ChatService.BroadcastFaction("!{#8181E9}HQ: " + user.Name + " wurde ins Gefängnis geliefert.", new List<int>() { 1, 3 });
} }
@@ -169,7 +180,17 @@ namespace ReallifeGamemode.Server.Wanted
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
player.TriggerEvent("jailTime", (int)(user.JailTime / 60)); int t = 0;
if (((int)(user.JailTime / 60)) == 0)
{
t = 1;
} else
{
t = (int)(user.JailTime / 60);
}
player.TriggerEvent("jailTime", t);
player.Health = 100; player.Health = 100;
} }
} }