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

hotfix

Browse Source
This commit is contained in:
Siga
2020-04-04 19:22:03 +02:00
parent 856b0617da
commit 8bb540fb97
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,17 +27,21 @@ 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>();
@@ -143,8 +147,10 @@ namespace ReallifeGamemode.Server.Job
{ {
if (data.getDataFromClient(player) == null) continue; if (data.getDataFromClient(player) == null) continue;
int count = data.getTrashCount(); Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData()}");
int count = data.getTrashCount();
Player target = data.getPartnerClient(player); Player target = data.getPartnerClient(player);
if (target != null) ChatService.SendMessage((Player)target, $"Fahrzeug wurde entleert. Säcke: {count}"); if (target != null) ChatService.SendMessage((Player)target, $"Fahrzeug wurde entleert. Säcke: {count}");
ChatService.SendMessage((Player)player, $"Fahrzeug wurde entleert. Säcke: {count}"); ChatService.SendMessage((Player)player, $"Fahrzeug wurde entleert. Säcke: {count}");
@@ -152,6 +158,7 @@ namespace ReallifeGamemode.Server.Job
//bonus pro sack //bonus pro sack
data.setTrashCount(0); data.setTrashCount(0);
return; return;
} }
} }
@@ -161,7 +168,7 @@ namespace ReallifeGamemode.Server.Job
private void SrvEvent_PlayerDc(Player player) private void SrvEvent_PlayerDc(Player player)
{ {
if (!GetPlayerInJob().Contains(player)) return; if (!GetPlayerInJob().Contains(player)) return;
if (player.GetUser().JobId != 2) 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;
@@ -183,7 +190,7 @@ namespace ReallifeGamemode.Server.Job
private void SrvEvent_PlayerDeath(Player player) private void SrvEvent_PlayerDeath(Player player)
{ {
if (!GetPlayerInJob().Contains(player)) return; if (!GetPlayerInJob().Contains(player)) return;
if (player.GetUser().JobId != 2) 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;
@@ -225,7 +232,7 @@ namespace ReallifeGamemode.Server.Job
{ {
Player target; Player target;
if (!GetPlayerInJob().Contains(player)) return; if (!GetPlayerInJob().Contains(player)) return;
if (player.GetUser().JobId != 2) 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)
{ {