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

Änderung Pilot,Busfahrer und und und

Browse Source
This commit is contained in:
Mac_Slash
2020-05-04 22:21:07 +02:00
parent 643a9c6775
commit b61c57a2d1
8 changed files with 50 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ReallifeGamemode.Server/Managers/JobManager.cs
View File

@@ -46,7 +46,7 @@ namespace ReallifeGamemode.Server.Managers
public static List<JobBase> GetJobs() => _jobs.OrderBy(j => j.Id).ToList();
public Dictionary<Player, PlayerTimer> playerTimersJobVehicleRespawn = new Dictionary<Player, PlayerTimer>();
public static Dictionary<Player, PlayerTimer> playerTimersJobVehicleRespawn = new Dictionary<Player, PlayerTimer>();
[RemoteEvent("CLIENT:JobCenter_CancelJob")]
public void CancelJobEvent(Player player)
@@ -232,7 +232,7 @@ namespace ReallifeGamemode.Server.Managers
{
//Vehicle LastVehicle = player.GetData<Vehicle>("LastVehicle");
Vehicle LastVehicle = veh;
JobBase job = GetJob(player.GetUser().JobId.Value);
JobBase job = GetJob(player.GetUser().JobId??-1);
if (LastVehicle.GetServerVehicle() is JobVehicle vehJ)
{
if (LastVehicle.GetData<bool>("timerJobVehicleRespawn") == true)
@@ -390,29 +390,23 @@ namespace ReallifeGamemode.Server.Managers
}
}
}
JobBase job = GetJob(player.GetUser().JobId.Value);
JobBase job = GetJob(player.GetUser().JobId ?? -1);
if (job.GetUsersInJob().Contains(player))
{
ChatService.SendMessage(player, "Debug1");
if (sVeh != null)
{
ChatService.SendMessage(player, "Debug2");
if (sVeh is JobVehicle JV)
{
ChatService.SendMessage(player, "Debug3");
if (player.GetUser().JobId == 3 || player.GetUser().JobId == 4)
{
ChatService.SendMessage(player, "Debug4");
if (seat == 0)
{
ChatService.SendMessage(player, "Debug5");
JobVehicle c = new JobVehicle();
if (JV.GetJob().GetUsersInJob().Contains(player))
{
if (!player.HasData("LastVehicle") || player.GetData<Vehicle>("LastVehicle") == null) return;
if (player.HasData("LastVehicle") && veh == player.GetData<Vehicle>("LastVehicle"))
{
ChatService.SendMessage(player, "Debug6");
veh.SetData("timerJobVehicleRespawn", false);
if (playerTimersJobVehicleRespawn.ContainsKey(player))
{
@@ -427,11 +421,9 @@ namespace ReallifeGamemode.Server.Managers
}
}
}
else ChatService.SendMessage(player, "Debug7");
}
else
{
ChatService.SendMessage(player, "Debug8");
job.StopJob(player);
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
if (playerTimersJobVehicleRespawn.ContainsKey(player))
@@ -449,7 +441,6 @@ namespace ReallifeGamemode.Server.Managers
}
else
{
ChatService.SendMessage(player, "Debug9");
job.StopJob(player);
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
if (playerTimersJobVehicleRespawn.ContainsKey(player))
@@ -465,7 +456,6 @@ namespace ReallifeGamemode.Server.Managers
}
else if(sVeh !is JobVehicle || veh != null)
{
ChatService.SendMessage(player, "Debug10");
job.StopJob(player);
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
if (playerTimersJobVehicleRespawn.ContainsKey(player))
@@ -482,7 +472,6 @@ namespace ReallifeGamemode.Server.Managers
{
if (JV.JobId != player.GetUser().JobId)
{
ChatService.SendMessage(player, "Debug11");
job.StopJob(player);
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
if (playerTimersJobVehicleRespawn.ContainsKey(player))
@@ -496,14 +485,6 @@ namespace ReallifeGamemode.Server.Managers
ServerVehicleExtensions.Spawn(nsSVeh, player.GetData<Vehicle>("LastVehicle"));
}
}
else
{
ChatService.SendMessage(player, "Debug12");
}
}
else
{
ChatService.SendMessage(player, "Debug13");
}
}