diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index 27d11f41..26567d3c 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -150,7 +150,7 @@ namespace ReallifeGamemode.Server.Managers } //JobPoint nearJobPoint = PositionManager.JobPoints.Find(p => p.Position.DistanceTo(player.Position) <= 2); - if(u.JobId == 2 || u.JobId == 3 || u.JobId == 4) + if (u.JobId == 2 || u.JobId == 3 || u.JobId == 4) { return; } @@ -232,7 +232,7 @@ namespace ReallifeGamemode.Server.Managers { //Vehicle LastVehicle = player.GetData("LastVehicle"); Vehicle LastVehicle = veh; - JobBase job = GetJob(player.GetUser().JobId??-1); + JobBase job = GetJob(player.GetUser().JobId ?? -1); if (LastVehicle.GetServerVehicle() is JobVehicle vehJ) { if (LastVehicle.GetData("timerJobVehicleRespawn") == true) @@ -347,7 +347,7 @@ namespace ReallifeGamemode.Server.Managers CheckPointHandle.DeleteCheckpoints(player); ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet."); } - + [ServerEvent(Event.PlayerEnterVehicle)] public void JobManagerPlayerEnterVehicle(Player player, Vehicle veh, sbyte seat) { @@ -391,7 +391,7 @@ namespace ReallifeGamemode.Server.Managers } } JobBase job = GetJob(player.GetUser().JobId ?? -1); - if (job.GetUsersInJob().Contains(player)) + if (job?.GetUsersInJob()?.Contains(player) ?? false) { if (sVeh != null) { @@ -454,7 +454,7 @@ namespace ReallifeGamemode.Server.Managers ServerVehicleExtensions.Spawn(nsSVeh, player.GetData("LastVehicle")); } } - else if(sVeh !is JobVehicle || veh != null) + else if (sVeh! is JobVehicle || veh != null) { job.StopJob(player); ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet."); @@ -491,7 +491,7 @@ namespace ReallifeGamemode.Server.Managers [ServerEvent(Event.PlayerEnterVehicleAttempt)] private void JobManagerEnterVehicleAttempt(Player player, Vehicle vehicle, sbyte seat) { - if (JobManager.GetJob().GetUsersInJob().Contains(player)){ JobManager.GetJob().MuellmannOnPlayerEnterVehicle(player, vehicle, seat); } + if (JobManager.GetJob().GetUsersInJob().Contains(player)) { JobManager.GetJob().MuellmannOnPlayerEnterVehicle(player, vehicle, seat); } } [ServerEvent(Event.PlayerDeath)]