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

Fix

Browse Source
This commit is contained in:
Lukas Moungos
2019-07-20 13:17:13 +02:00
parent 8b4796cd85
commit c27f2a7d82
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,6 +217,8 @@ namespace ReallifeGamemode.Server.Commands
} }
User targetUser = target.GetUser(); User targetUser = target.GetUser();
targetUser.GiveWanteds(player, amount, reason); targetUser.GiveWanteds(player, amount, reason);
ChatService.SendMessage(target, "Du hast von "+player.Name+" einen Fahndungslevel von "+amount+" bekommen.");
ChatService.SendMessage(target, "Grund: " +reason);
} }
[Command("clear", "~m~Benutzung: ~s~/clear [Name / ID] [Grund]", GreedyArg = true)] [Command("clear", "~m~Benutzung: ~s~/clear [Name / ID] [Grund]", GreedyArg = true)]

3
ReallifeGamemode.Server/Extensions/ClientExtension.cs
View File

@@ -108,7 +108,8 @@ namespace ReallifeGamemode.Server.Extensions
User copUser = copPlayer.GetUser(); User copUser = copPlayer.GetUser();
if((copUser.FactionId == 1 || copUser.FactionId == 3) && cop != null) if((copUser.FactionId == 1 || copUser.FactionId == 3) && cop != null)
{ {
ChatService.SendMessage(copPlayer, "~r~HQ: Straftat gemeldet von " + cop.Name + " mit Fahndungslevel "+ amount +". Grund: " + reason + ". Straftäter: "+ user.Name + "."); ChatService.SendMessage(copPlayer, "~r~HQ: Straftat gemeldet von " + cop.Name + " mit Fahndungslevel "+ amount +". Straftäter: "+ user.Name + ".");
ChatService.SendMessage(copPlayer, "~r~HQ: Grund: " + reason + ".");
ChatService.SendMessage(copPlayer, "~r~HQ: Der Straftäter: " + user.Name + " wird nun mit "+ user.Wanteds +" gesucht."); ChatService.SendMessage(copPlayer, "~r~HQ: Der Straftäter: " + user.Name + " wird nun mit "+ user.Wanteds +" gesucht.");
} }
else if((copUser.FactionId == 1 || copUser.FactionId == 3) && cop == null) else if((copUser.FactionId == 1 || copUser.FactionId == 3) && cop == null)

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

@@ -46,11 +46,13 @@ namespace ReallifeGamemode.Server.Wanted
{ {
if(!client.HasData("isDead") || client.GetData("isDead") == false) if(!client.HasData("isDead") || client.GetData("isDead") == false)
{ {
client.GetUser(dbContext).JailTime = (user.Wanteds * 54) / 2; // 54 sec for each wanted star -> in total 45min for 50 Wanteds client.GetUser(dbContext).JailTime = (user.Wanteds * 54) / 2; // 54 sec for each wanted star -> in total 45min for 50 Wanteds
Jailtime[user.Id] = (user.JailTime * 54) / 2; // 54 sec for each wanted star -> in total 45min for 50 Wanteds
} }
else else
{ {
client.GetUser(dbContext).JailTime = (user.Wanteds * 54); client.GetUser(dbContext).JailTime = user.Wanteds * 54;
Jailtime[user.Id] = user.JailTime * 54; // 54 sec for each wanted star -> in total 45min for 50 Wanteds
} }
client.GetUser(dbContext).Wanteds = 0; client.GetUser(dbContext).Wanteds = 0;
dbContext.SaveChanges(); dbContext.SaveChanges();
@@ -77,12 +79,12 @@ namespace ReallifeGamemode.Server.Wanted
User copUser = copPlayer.GetUser(); User copUser = copPlayer.GetUser();
if ((copUser.FactionId == 1 || copUser.FactionId == 3)) if ((copUser.FactionId == 1 || copUser.FactionId == 3))
{ {
ChatService.SendMessage(copPlayer, "~r~HQ: " + user.Name + " wurde im Knast zugewiesen."); ChatService.SendMessage(copPlayer, "~r~HQ: " + user.Name + " wurde im Gefängnis zugewiesen.");
} }
} }
ChatService.SendMessage(client, "Du bist im Gefängnis für " + user.JailTime + " sekunden."); ChatService.SendMessage(client, "Du bist im Gefängnis für " + user.JailTime + " Sekunden.");
Jailtime[user.Id] = user.Wanteds * 54; // 54 sec for each wanted star -> in total 45min for 50 Wanteds
} }
} }
} }

2
ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs
View File

@@ -43,7 +43,7 @@ namespace ReallifeGamemode.Server.Wanted
foreach (var player in NAPI.Pools.GetAllPlayers()) foreach (var player in NAPI.Pools.GetAllPlayers())
{ {
User user = player.GetUser(); User user = player.GetUser();
if (user.Wanteds > 0) if (user != null && user.Wanteds > 0)
{ {
if (!waTimer.ContainsKey(user.Id)) if (!waTimer.ContainsKey(user.Id))
ResetWantedTimeToElapse(player); ResetWantedTimeToElapse(player);