aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Siga
2020-04-04 19:44:01 +02:00
parent 46fac4d558
commit 6f8de7553e
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
View File

@@ -7,6 +7,7 @@ using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Database.Models; using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Core.Managers; using ReallifeGamemode.Server.Core.Managers;
using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Database.Entities;
namespace ReallifeGamemode.Server.Job namespace ReallifeGamemode.Server.Job
{ {
@@ -165,7 +166,9 @@ namespace ReallifeGamemode.Server.Job
private void SrvEvent_PlayerDc(Player player) private void SrvEvent_PlayerDc(Player player)
{ {
if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return; if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return;
User u = player.GetUser();
if (u.JobId != this.Id) return;
foreach (var data in muellmanData) foreach (var data in muellmanData)
{ {
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
@@ -187,6 +190,8 @@ namespace ReallifeGamemode.Server.Job
private void SrvEvent_PlayerDeath(Player player) private void SrvEvent_PlayerDeath(Player player)
{ {
if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return; if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return;
User u = player.GetUser();
if (u.JobId != this.Id) return;
foreach (var data in muellmanData) foreach (var data in muellmanData)
{ {
@@ -229,6 +234,8 @@ namespace ReallifeGamemode.Server.Job
{ {
Player target; Player target;
if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return; 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) if (vehicle.Model == (uint)Types.VehicleModel.Trash || vehicle.Model == (uint)Types.VehicleModel.Trash2)
{ {

3
ReallifeGamemode.Server/Job/TaxiDriverJob.cs
View File

@@ -103,11 +103,10 @@ namespace ReallifeGamemode.Server.Job
public static void UpdateFare() public static void UpdateFare()
{ {
Console.WriteLine($"{GetPlayerInJob().Count}");
foreach (var player in GetPlayerInJob()) foreach (var player in GetPlayerInJob())
{ {
User u = player.GetUser(); User u = player.GetUser();
if (u.JobId != 1) return; if (u.JobId != 1) return;
Console.WriteLine(player.Name); Console.WriteLine(player.Name);
if (!player.HasData("hasPassager")) { player.SetData<bool>("hasPassager", false); continue; } if (!player.HasData("hasPassager")) { player.SetData<bool>("hasPassager", false); continue; }
int playerId = player.GetUser().Id; int playerId = player.GetUser().Id;