diff --git a/ReallifeGamemode.Server/Job/JobBase.cs b/ReallifeGamemode.Server/Job/JobBase.cs index d40f5c81..63e54619 100644 --- a/ReallifeGamemode.Server/Job/JobBase.cs +++ b/ReallifeGamemode.Server/Job/JobBase.cs @@ -1,9 +1,11 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Server.Extensions; + namespace ReallifeGamemode.Server.Job { @@ -43,11 +45,24 @@ namespace ReallifeGamemode.Server.Job _inJob.Remove(player); jobPlayer.Remove(player); + + + User user = player.GetUser(); + + using (var dbContext = new DatabaseContext()) + { + user = player.GetUser(dbContext); + user.trashcount -= user.trashcount; + dbContext.SaveChanges(); + } + if (quit) { ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{this.Name}~s~ beendet."); } + + JobStop?.Invoke(player); } diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index aabd0d4e..77e2e674 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -212,13 +212,11 @@ namespace ReallifeGamemode.Server.Job [RemoteEvent("CLIENT:MuellmannAddSack")] public void MuellmannAddSack(Player player) - { - + { foreach (var data in muellmanData) { if (data.getDataFromClient(player) == null) continue; Player target = data.getPartnerClient(player); - data.setTrashCount(data.getTrashCount() + 1); User user1 = player.GetUser(); User user2 = target.GetUser(); using (var dbContext = new DatabaseContext()) @@ -232,9 +230,7 @@ namespace ReallifeGamemode.Server.Job } player.AddAttachment("binbag", true); if (target != null) - ChatService.SendMessage((Player)target, $"Du hast soviele Säcke: {target.GetUser().trashcount}"); - ChatService.SendMessage((Player)player, $"Du hast soviele Säcke: {player.GetUser().trashcount}"); - if (player.GetUser().trashcount >= 5) + 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"); } @@ -286,9 +282,9 @@ namespace ReallifeGamemode.Server.Job user1 = player.GetUser(dbContext); user2 = target.GetUser(dbContext); - user1.trashcount -= 5; - if (target != null) - user2.trashcount -= 5; + user1.trashcount -= user1.trashcount; + if (target != null) + user2.trashcount -= user2.trashcount; dbContext.SaveChanges(); } Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData().Count} | Säcke: {data.getTrashCount()}");