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

try fix

Browse Source
This commit is contained in:
Siga
2020-04-04 19:38:07 +02:00
parent 8bb540fb97
commit 46fac4d558
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,21 +27,18 @@ namespace ReallifeGamemode.Server.Job
private void RefuseCollectorJobJobStart(Player player) private void RefuseCollectorJobJobStart(Player player)
{ {
if (!playersInThisJob.Contains(player))
playersInThisJob.Add(player);
//setClothes //setClothes
} }
private void RefuseCollectorJobJobStop(Player player) private void RefuseCollectorJobJobStop(Player player)
{ {
if (playersInThisJob.Contains(player))
playersInThisJob.Remove(player);
//removeClothes and replace with old //removeClothes and replace with old
MuellmannJobBeenden(player); MuellmannJobBeenden(player);
} }
private List<Player> playersInThisJob = new List<Player>();
public List<MuellmannData> muellmanData = new List<MuellmannData>(); public List<MuellmannData> muellmanData = new List<MuellmannData>();
private List<Vector3> vector3s = new List<Vector3>(); private List<Vector3> vector3s = new List<Vector3>();
@@ -167,8 +164,8 @@ namespace ReallifeGamemode.Server.Job
[ServerEvent(Event.PlayerDisconnected)] [ServerEvent(Event.PlayerDisconnected)]
private void SrvEvent_PlayerDc(Player player) private void SrvEvent_PlayerDc(Player player)
{ {
if (!GetPlayerInJob().Contains(player)) return; if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return;
if (!playersInThisJob.Contains(player)) return;
foreach (var data in muellmanData) foreach (var data in muellmanData)
{ {
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
@@ -189,8 +186,8 @@ namespace ReallifeGamemode.Server.Job
[ServerEvent(Event.PlayerDeath)] [ServerEvent(Event.PlayerDeath)]
private void SrvEvent_PlayerDeath(Player player) private void SrvEvent_PlayerDeath(Player player)
{ {
if (!GetPlayerInJob().Contains(player)) return; if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return;
if (!playersInThisJob.Contains(player)) return;
foreach (var data in muellmanData) foreach (var data in muellmanData)
{ {
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
@@ -231,8 +228,7 @@ namespace ReallifeGamemode.Server.Job
public void SrvEvent_PlayerEnterVehicle(Player player, Vehicle vehicle, sbyte seat) public void SrvEvent_PlayerEnterVehicle(Player player, Vehicle vehicle, sbyte seat)
{ {
Player target; Player target;
if (!GetPlayerInJob().Contains(player)) return; if (!player.IsLoggedIn() || !GetPlayerInJob().Contains(player)) return;
if (!playersInThisJob.Contains(player)) 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)
{ {

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

@@ -103,6 +103,7 @@ 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();