ist das denn die möglichkeit?

This commit is contained in:
hydrant
2020-05-10 23:28:44 +02:00
parent ccbf1ff41c
commit 8bf8944596
8 changed files with 34 additions and 25 deletions

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Job;
@@ -59,7 +60,7 @@ namespace ReallifeGamemode.Server.Util
{
if (user.GetUser().JobId == 4)
{
Job.JobBase job = Managers.JobManager.GetJob(user.GetUser().JobId??-1);
Job.JobBase job = Managers.JobManager.GetJob(user.GetUser().JobId ?? -1);
if (job.GetUsersInJob().Contains(user))
{
if (!user.IsInVehicle || user.VehicleSeat != 0) return;
@@ -166,7 +167,7 @@ namespace ReallifeGamemode.Server.Util
}
if (temp.LastCheckpoint != 1)
{
Job.JobBase job = Managers.JobManager.GetJob(user.GetUser().JobId??-1);
Job.JobBase job = Managers.JobManager.GetJob(user.GetUser().JobId ?? -1);
if (job.GetUsersInJob().Contains(user))
{
if (user.GetUser().JobId == 3)
@@ -201,7 +202,7 @@ namespace ReallifeGamemode.Server.Util
{
if (temp.checkPointsDone == 2)
{
if(user.GetData<string>("Route") == "Skill1Route1" || user.GetData<string>("Route") == "Skill1Route2" || user.GetData<string>("Route") == "Skill1Route3" || user.GetData<string>("Route") == "Skill1Route4")
if (user.GetData<string>("Route") == "Skill1Route1" || user.GetData<string>("Route") == "Skill1Route2" || user.GetData<string>("Route") == "Skill1Route3" || user.GetData<string>("Route") == "Skill1Route4")
{
BusDriverJob.payWage(user, BusSkill1RouteVerdienst / temp.list.Count());
BusDriverJob.payWage(user, BusSkill1RouteVerdienst / temp.list.Count());
@@ -288,11 +289,11 @@ namespace ReallifeGamemode.Server.Util
this.checkPointsDone++;
if (this.list.Count() > checkPointsDone)
{
LastCheckpoint = 0;
Vector3 nextCp = list.ElementAt(checkPointsDone);
LastCheckpoint = 0;
Vector3 nextCp = list.ElementAt(checkPointsDone);
this.player.TriggerEvent("setCheckPoint", nextCp, player, this.checkPointsDone, delay, this.markerID, this.markerSize, this.markerDist, this.useVehicle, this.eventInCheckpoint);
}
if (checkPointsDone == this.list.Count()-1)
if (checkPointsDone == this.list.Count() - 1)
{
LastCheckpoint = 1;
}