Merge

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);
 

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);
     }
 

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;

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.");
@@ -772,13 +772,13 @@ namespace ReallifeGamemode.Server.Managers
       if (!player.IsLoggedIn()) return;
       List<Player> players = NAPI.Pools.GetAllPlayers();
 
-      var listPlayers = players.Where(p => p.GetUser().Wanteds > 0)
+      var listPlayers = players
         .Select(p => new
         {
           Id = p.Handle.Value,
           p.Name,
-        wanted = p.GetUser().Wanteds,
-      });
+          wanted = p.GetUser()?.Wanteds,
+        }).Where(u => u.wanted > 0).ToList();
 
       if (listPlayers.Count() > 0)
         player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers));