diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index 80253bb1..4c26ea9f 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -199,6 +199,11 @@ namespace ReallifeGamemode.Server.Job [RemoteEvent("CLIENT:MuellmannImShape")] public void MuellmannImShape(Player player, int colshapeIndex) { + if (player.IsInVehicle) + { + return; + } + foreach (var data in muellmanData) { if (data.getDataFromClient(player) == null) continue; @@ -212,46 +217,52 @@ namespace ReallifeGamemode.Server.Job [RemoteEvent("CLIENT:MuellmannAddSack")] public void MuellmannAddSack(Player player) - { + { + if (player.IsInVehicle) + { + return; + } + foreach (var data in muellmanData) { if (data.getDataFromClient(player) == null) continue; Player target = data.getPartnerClient(player); - User user1 = player.GetUser(); - User user2 = target.GetUser(); - using (var dbContext = new DatabaseContext()) - { - user1 = player.GetUser(dbContext); - user2 = target.GetUser(dbContext); - user1.trashcount += 1; - player.SendNotification("Müllsack: " + user1.trashcount + " von 20."); - if (target != null) { - target.SendNotification("Müllsack: " + user2.trashcount + " von 20."); - user2.trashcount += 1; - } - dbContext.SaveChanges(); - } - player.AddAttachment("binbag", true); - if (target != null) - if (player.GetUser().trashcount >= 20) - { - ChatService.SendMessage((Player)player, "Auto ist voll fahre nun zu Base."); - if (target != null) { ChatService.SendMessage((Player)target, "Auto ist voll fahre nun zu Base."); target.TriggerEvent("SERVER:MuellmannZuBase"); } - player.TriggerEvent("SERVER:MuellmannZuBase"); - } - else + User user1 = player.GetUser(); + User user2 = target.GetUser(); + using (var dbContext = new DatabaseContext()) { + user1 = player.GetUser(dbContext); + user2 = target.GetUser(dbContext); + user1.trashcount += 1; + player.SendNotification("Müllsack: " + user1.trashcount + " von 20."); if (target != null) { - player.GetUser().Wage += 10; - target.GetUser().Wage += 10; - + target.SendNotification("Müllsack: " + user2.trashcount + " von 20."); + user2.trashcount += 1; + } + dbContext.SaveChanges(); + } + player.AddAttachment("binbag", true); + if (target != null) + if (player.GetUser().trashcount >= 20) + { + ChatService.SendMessage((Player)player, "Auto ist voll fahre nun zu Base."); + if (target != null) { ChatService.SendMessage((Player)target, "Auto ist voll fahre nun zu Base."); target.TriggerEvent("SERVER:MuellmannZuBase"); } + player.TriggerEvent("SERVER:MuellmannZuBase"); } else { - player.GetUser().Wage += 20; + if (target != null) + { + player.GetUser().Wage += 10; + target.GetUser().Wage += 10; + + } + else + { + player.GetUser().Wage += 20; + } } - } return; } } @@ -278,18 +289,18 @@ namespace ReallifeGamemode.Server.Job { player.GetUser().Wage += 200; } - User user1 = player.GetUser(); - User user2 = target.GetUser(); - using (var dbContext = new DatabaseContext()) - { + User user1 = player.GetUser(); + User user2 = target.GetUser(); + using (var dbContext = new DatabaseContext()) + { user1 = player.GetUser(dbContext); user2 = target.GetUser(dbContext); user1.trashcount -= user1.trashcount; if (target != null) - user2.trashcount -= user2.trashcount; - dbContext.SaveChanges(); - } + user2.trashcount -= user2.trashcount; + dbContext.SaveChanges(); + } Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData().Count} | Säcke: {data.getTrashCount()}"); return; }