diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index 95b6e441..190df80e 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -27,21 +27,18 @@ namespace ReallifeGamemode.Server.Job private void RefuseCollectorJobJobStart(Player player) { - if (!playersInThisJob.Contains(player)) - playersInThisJob.Add(player); + //setClothes } private void RefuseCollectorJobJobStop(Player player) { - if (playersInThisJob.Contains(player)) - playersInThisJob.Remove(player); + //removeClothes and replace with old MuellmannJobBeenden(player); } - private List playersInThisJob = new List(); public List muellmanData = new List(); private List vector3s = new List(); @@ -167,8 +164,8 @@ namespace ReallifeGamemode.Server.Job [ServerEvent(Event.PlayerDisconnected)] private void SrvEvent_PlayerDc(Player player) { - if (!GetPlayerInJob().Contains(player)) return; - if (!playersInThisJob.Contains(player)) return; + if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return; + foreach (var data in muellmanData) { if (data.getDataFromClient(player) == null) continue; @@ -189,8 +186,8 @@ namespace ReallifeGamemode.Server.Job [ServerEvent(Event.PlayerDeath)] private void SrvEvent_PlayerDeath(Player player) { - if (!GetPlayerInJob().Contains(player)) return; - if (!playersInThisJob.Contains(player)) return; + if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return; + foreach (var data in muellmanData) { if (data.getDataFromClient(player) == null) continue; @@ -231,8 +228,7 @@ namespace ReallifeGamemode.Server.Job public void SrvEvent_PlayerEnterVehicle(Player player, Vehicle vehicle, sbyte seat) { Player target; - if (!GetPlayerInJob().Contains(player)) return; - if (!playersInThisJob.Contains(player)) return; + if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return; if (vehicle.Model == (uint)Types.VehicleModel.Trash || vehicle.Model == (uint)Types.VehicleModel.Trash2) { diff --git a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs index 2ae1865b..0c7b5a07 100644 --- a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs +++ b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs @@ -103,6 +103,7 @@ namespace ReallifeGamemode.Server.Job public static void UpdateFare() { + Console.WriteLine($"{GetPlayerInJob().Count}"); foreach (var player in GetPlayerInJob()) { User u = player.GetUser();