From 6f8de7553edf0c3bb27a8826f4bc83081b0838af Mon Sep 17 00:00:00 2001 From: Siga Date: Sat, 4 Apr 2020 19:44:01 +0200 Subject: [PATCH] fix --- ReallifeGamemode.Server/Job/RefuseCollectorJob.cs | 9 ++++++++- ReallifeGamemode.Server/Job/TaxiDriverJob.cs | 3 +-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index 190df80e..77d909e9 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -7,6 +7,7 @@ using ReallifeGamemode.Server.Services; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Core.Managers; using ReallifeGamemode.Server.Extensions; +using ReallifeGamemode.Database.Entities; namespace ReallifeGamemode.Server.Job { @@ -165,7 +166,9 @@ namespace ReallifeGamemode.Server.Job private void SrvEvent_PlayerDc(Player player) { if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return; - + User u = player.GetUser(); + if (u.JobId != this.Id) return; + foreach (var data in muellmanData) { if (data.getDataFromClient(player) == null) continue; @@ -187,6 +190,8 @@ namespace ReallifeGamemode.Server.Job private void SrvEvent_PlayerDeath(Player player) { if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return; + User u = player.GetUser(); + if (u.JobId != this.Id) return; foreach (var data in muellmanData) { @@ -229,6 +234,8 @@ namespace ReallifeGamemode.Server.Job { Player target; if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return; + User u = player.GetUser(); + if (u.JobId != this.Id) 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 0c7b5a07..66d02a8b 100644 --- a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs +++ b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs @@ -103,11 +103,10 @@ namespace ReallifeGamemode.Server.Job public static void UpdateFare() { - Console.WriteLine($"{GetPlayerInJob().Count}"); foreach (var player in GetPlayerInJob()) { User u = player.GetUser(); - if (u.JobId != 1) return; + if (u.JobId != 1) return; Console.WriteLine(player.Name); if (!player.HasData("hasPassager")) { player.SetData("hasPassager", false); continue; } int playerId = player.GetUser().Id;