From 005ff5be2cde438f5c72db7c52bddaa70e84bc0c Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 5 Apr 2021 18:07:54 +0200 Subject: [PATCH 1/4] invite fraklohn und waffenkammer fix --- ReallifeGamemode.Server/Managers/InteractionManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 0ad66ab3..5d6875fc 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -63,7 +63,7 @@ namespace ReallifeGamemode.Server.Managers own.FactionRank = dbContext .FactionRanks .OrderBy(x => x.Order) - .Where(r => r.FactionId == own.FactionId) + .Where(r => r.FactionId == u.FactionId) .FirstOrDefault(); ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen."); From 696cd5f6f56b67fe79f01f0763650e3e9a453852 Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 5 Apr 2021 18:53:05 +0200 Subject: [PATCH 2/4] fix wanteds nametag blip --- ReallifeGamemode.Server/Extensions/ClientExtension.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index 6849968d..ebdee723 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -129,9 +129,9 @@ namespace ReallifeGamemode.Server.Extensions { User dbUser = dbContext.Users.Where(u => u.Id == user.Id).FirstOrDefault(); dbUser.Wanteds = newWanteds; + dbUser.SetBlipAndNametagColor(); dbContext.SaveChanges(); } - user.SetBlipAndNametagColor(); ChatService.SendMessage(user.Player, "!{#FF614A}Du hast ein Verbrechen begangen: " + reason + "" + (cop != null ? " | Gemeldet von: " + cop.Name + "." : "")); ChatService.SendMessage(user.Player, " !{#FFFF00}Fahnundgslevel:~s~ " + newWanteds); From afaa4202d9b75f0bf2fc9a33da01f0b3d1c57326 Mon Sep 17 00:00:00 2001 From: kookroach Date: Mon, 5 Apr 2021 19:07:00 +0200 Subject: [PATCH 3/4] fix message --- ReallifeGamemode.Server/Job/JobBase.cs | 9 ++------- ReallifeGamemode.Server/Job/RefuseCollectorJob.cs | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ReallifeGamemode.Server/Job/JobBase.cs b/ReallifeGamemode.Server/Job/JobBase.cs index 7b4488d3..325c4cb2 100644 --- a/ReallifeGamemode.Server/Job/JobBase.cs +++ b/ReallifeGamemode.Server/Job/JobBase.cs @@ -6,7 +6,6 @@ using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Extensions; - namespace ReallifeGamemode.Server.Job { public abstract class JobBase : Script @@ -36,7 +35,7 @@ namespace ReallifeGamemode.Server.Job _inJob.Add(player); jobPlayer.Add(player); - ChatService.SendMessage(player, $"~y~Job:~s~ Du hast deinen Job (~o~{this.Name}~s~) gestartet."); + ChatService.SendMessage(player, $"~y~[Job]~s~ Du hast deinen Job (~o~{this.Name}~s~) gestartet."); JobStart?.Invoke(player); } @@ -47,8 +46,6 @@ namespace ReallifeGamemode.Server.Job _inJob.Remove(player); jobPlayer.Remove(player); - - User user = player.GetUser(); using (var dbContext = new DatabaseContext()) @@ -60,11 +57,9 @@ namespace ReallifeGamemode.Server.Job if (quit) { - ChatService.SendMessage(player, $"~y~Job:~s~ Du hast deinen Job (~o~{this.Name}~s~) beendet."); + ChatService.SendMessage(player, $"~y~[Job]~s~ Du hast deinen Job (~o~{this.Name}~s~) beendet."); } - - JobStop?.Invoke(player); } diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index 80ff25ee..8ed29f14 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -170,7 +170,6 @@ namespace ReallifeGamemode.Server.Job if (data.getDataFromClient(player) == null) continue; veh = data.vehicle; JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1); - ChatService.SendMessage((Player)player, $"~y~[Job] ~s~Du hast deinen Job (~o~{job.Name}~s~) gestartet."); player.TriggerEvent("SERVER:MuellmannStatusTrue"); player.TriggerEvent("SERVER:MuellmannBCSErstellen", JsonConvert.SerializeObject(vector3s.ToArray()), veh); return; From f0186ca155136639f62034d1398513ccbeac0409 Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 5 Apr 2021 20:42:20 +0200 Subject: [PATCH 4/4] fix wantedlist --- .../Managers/InteractionManager.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 5d6875fc..5557ee5e 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -772,13 +772,13 @@ namespace ReallifeGamemode.Server.Managers if (!player.IsLoggedIn()) return; List players = NAPI.Pools.GetAllPlayers(); - var listPlayers = players.Where(p => p.GetUser().Wanteds > 0) - .Select(p => new - { - Id = p.Handle.Value, - p.Name, - wanted = p.GetUser().Wanteds, - }); + var listPlayers = players + .Select(p => new + { + Id = p.Handle.Value, + p.Name, + wanted = p.GetUser()?.Wanteds, + }).Where(u => u.wanted > 0).ToList(); if (listPlayers.Count() > 0) player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers));