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

fix Wanted color player

Browse Source
This commit is contained in:
Lukas Moungos
2019-12-15 14:42:27 +01:00
parent c2f5c9e039
commit dcabc6eaf5
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,7 +305,7 @@ namespace ReallifeGamemode.Server.Commands
target.SetSharedData("blipColor", 5); target.SetSharedData("blipColor", 5);
break; break;
} }
target.TriggerEvent("jailTime", 0);
targetUser.Wanteds = 0; targetUser.Wanteds = 0;
dbContext.SaveChanges(); dbContext.SaveChanges();

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

@@ -22,22 +22,6 @@ namespace ReallifeGamemode.Server.Wanted
User user = client.GetUser(); User user = client.GetUser();
if (user.JailTime > 0) if (user.JailTime > 0)
{ {
switch (user.FactionId)
{
case null:
client.SetSharedData("blipColor", 0);
break;
case 8:
client.SetSharedData("blipColor", 83);
break;
case 7:
client.SetSharedData("blipColor", 52);
break;
case 4:
client.SetSharedData("blipColor", 5);
break;
}
client.RemoveAllWeapons(); client.RemoveAllWeapons();
client.Health = 100; client.Health = 100;
client.Armor = 0; client.Armor = 0;
@@ -106,6 +90,22 @@ namespace ReallifeGamemode.Server.Wanted
client.TriggerEvent("jailTime", timeMinutes); client.TriggerEvent("jailTime", timeMinutes);
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 });
switch (user.FactionId)
{
case null:
client.SetSharedData("blipColor", 0);
break;
case 8:
client.SetSharedData("blipColor", 83);
break;
case 7:
client.SetSharedData("blipColor", 52);
break;
case 4:
client.SetSharedData("blipColor", 5);
break;
}
} }
} }
} }
@@ -166,6 +166,7 @@ namespace ReallifeGamemode.Server.Wanted
user = player.GetUser(dbContext); user = player.GetUser(dbContext);
user.JailTime = 0; user.JailTime = 0;
user.GiveWanteds(null, 50, "Knast-Ausbruch"); user.GiveWanteds(null, 50, "Knast-Ausbruch");
player.TriggerEvent("jailTime", 0);
dbContext.SaveChanges(); dbContext.SaveChanges();
Jailtime.Remove(user.Id); Jailtime.Remove(user.Id);
} }
@@ -184,8 +185,8 @@ namespace ReallifeGamemode.Server.Wanted
if (user.JailTime <= 0) if (user.JailTime <= 0)
{ {
player.Position = new Vector3(461.7256, -988.6035, 24.91487);
Jailtime.Remove(user.Id); Jailtime.Remove(user.Id);
player.Position = new Vector3(461.7256, -988.6035, 24.91487);
return; return;
} }
if (user.JailTime > 0) if (user.JailTime > 0)