diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index 2cc5a930..95b6e441 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -27,17 +27,21 @@ 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(); @@ -143,8 +147,10 @@ namespace ReallifeGamemode.Server.Job { if (data.getDataFromClient(player) == null) continue; - int count = data.getTrashCount(); + Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData()}"); + int count = data.getTrashCount(); + Player target = data.getPartnerClient(player); if (target != null) ChatService.SendMessage((Player)target, $"Fahrzeug wurde entleert. Säcke: {count}"); ChatService.SendMessage((Player)player, $"Fahrzeug wurde entleert. Säcke: {count}"); @@ -152,6 +158,7 @@ namespace ReallifeGamemode.Server.Job //bonus pro sack data.setTrashCount(0); + return; } } @@ -161,7 +168,7 @@ namespace ReallifeGamemode.Server.Job private void SrvEvent_PlayerDc(Player player) { if (!GetPlayerInJob().Contains(player)) return; - if (player.GetUser().JobId != 2) return; + if (!playersInThisJob.Contains(player)) return; foreach (var data in muellmanData) { if (data.getDataFromClient(player) == null) continue; @@ -183,7 +190,7 @@ namespace ReallifeGamemode.Server.Job private void SrvEvent_PlayerDeath(Player player) { if (!GetPlayerInJob().Contains(player)) return; - if (player.GetUser().JobId != 2) return; + if (!playersInThisJob.Contains(player)) return; foreach (var data in muellmanData) { if (data.getDataFromClient(player) == null) continue; @@ -225,7 +232,7 @@ namespace ReallifeGamemode.Server.Job { Player target; if (!GetPlayerInJob().Contains(player)) return; - if (player.GetUser().JobId != 2) return; + if (!playersInThisJob.Contains(player)) return; if (vehicle.Model == (uint)Types.VehicleModel.Trash || vehicle.Model == (uint)Types.VehicleModel.Trash2) {