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

vlt fix wenn rein ins kfz

Browse Source
This commit is contained in:
hydrant
2020-05-07 21:34:24 +02:00
parent b7da065240
commit adb30a1cda
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,7 @@ namespace ReallifeGamemode.Server.Managers
} }
//JobPoint nearJobPoint = PositionManager.JobPoints.Find(p => p.Position.DistanceTo(player.Position) <= 2); //JobPoint nearJobPoint = PositionManager.JobPoints.Find(p => p.Position.DistanceTo(player.Position) <= 2);
if(u.JobId == 2 || u.JobId == 3 || u.JobId == 4) if (u.JobId == 2 || u.JobId == 3 || u.JobId == 4)
{ {
return; return;
} }
@@ -232,7 +232,7 @@ namespace ReallifeGamemode.Server.Managers
{ {
//Vehicle LastVehicle = player.GetData<Vehicle>("LastVehicle"); //Vehicle LastVehicle = player.GetData<Vehicle>("LastVehicle");
Vehicle LastVehicle = veh; Vehicle LastVehicle = veh;
JobBase job = GetJob(player.GetUser().JobId??-1); JobBase job = GetJob(player.GetUser().JobId ?? -1);
if (LastVehicle.GetServerVehicle() is JobVehicle vehJ) if (LastVehicle.GetServerVehicle() is JobVehicle vehJ)
{ {
if (LastVehicle.GetData<bool>("timerJobVehicleRespawn") == true) if (LastVehicle.GetData<bool>("timerJobVehicleRespawn") == true)
@@ -347,7 +347,7 @@ namespace ReallifeGamemode.Server.Managers
CheckPointHandle.DeleteCheckpoints(player); CheckPointHandle.DeleteCheckpoints(player);
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet."); ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
} }
[ServerEvent(Event.PlayerEnterVehicle)] [ServerEvent(Event.PlayerEnterVehicle)]
public void JobManagerPlayerEnterVehicle(Player player, Vehicle veh, sbyte seat) public void JobManagerPlayerEnterVehicle(Player player, Vehicle veh, sbyte seat)
{ {
@@ -391,7 +391,7 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
JobBase job = GetJob(player.GetUser().JobId ?? -1); JobBase job = GetJob(player.GetUser().JobId ?? -1);
if (job.GetUsersInJob().Contains(player)) if (job?.GetUsersInJob()?.Contains(player) ?? false)
{ {
if (sVeh != null) if (sVeh != null)
{ {
@@ -454,7 +454,7 @@ namespace ReallifeGamemode.Server.Managers
ServerVehicleExtensions.Spawn(nsSVeh, player.GetData<Vehicle>("LastVehicle")); ServerVehicleExtensions.Spawn(nsSVeh, player.GetData<Vehicle>("LastVehicle"));
} }
} }
else if(sVeh !is JobVehicle || veh != null) else if (sVeh! is JobVehicle || veh != null)
{ {
job.StopJob(player); job.StopJob(player);
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet."); ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
@@ -491,7 +491,7 @@ namespace ReallifeGamemode.Server.Managers
[ServerEvent(Event.PlayerEnterVehicleAttempt)] [ServerEvent(Event.PlayerEnterVehicleAttempt)]
private void JobManagerEnterVehicleAttempt(Player player, Vehicle vehicle, sbyte seat) private void JobManagerEnterVehicleAttempt(Player player, Vehicle vehicle, sbyte seat)
{ {
if (JobManager.GetJob<RefuseCollectorJob>().GetUsersInJob().Contains(player)){ JobManager.GetJob<RefuseCollectorJob>().MuellmannOnPlayerEnterVehicle(player, vehicle, seat); } if (JobManager.GetJob<RefuseCollectorJob>().GetUsersInJob().Contains(player)) { JobManager.GetJob<RefuseCollectorJob>().MuellmannOnPlayerEnterVehicle(player, vehicle, seat); }
} }
[ServerEvent(Event.PlayerDeath)] [ServerEvent(Event.PlayerDeath)]