From e2f6edd0993aa23ba27432ca920f2d13911a29a5 Mon Sep 17 00:00:00 2001 From: Mac_Slash Date: Thu, 14 May 2020 00:07:05 +0200 Subject: [PATCH] Busfahrer, Pilot, Bugfix + Neue Routen + Routenfix --- ReallifeGamemode.Server/Events/Disconnect.cs | 1 - .../Events/EnterVehicleAttempt.cs | 6 +- .../Events/ResourceStop.cs | 1 - ReallifeGamemode.Server/Finance/Economy.cs | 1 - ReallifeGamemode.Server/Job/BusDriverJob.cs | 160 ++++++++++++------ ReallifeGamemode.Server/Job/PilotJob.cs | 62 ++++--- .../Job/RefuseCollectorJob.cs | 21 ++- ReallifeGamemode.Server/Job/TaxiDriverJob.cs | 2 +- .../Managers/InteractionManager.cs | 3 - .../Managers/JobManager.cs | 6 - 10 files changed, 166 insertions(+), 97 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 77bc9238..84fe2fb8 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -13,7 +13,6 @@ using ReallifeGamemode.Server.Util; using ReallifeGamemode.Services; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Types; -using ReallifeGamemode.Server.Util; /** diff --git a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs index f01507b1..0c1efa69 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs @@ -52,21 +52,21 @@ namespace ReallifeGamemode.Server.Events } else { - if ((VehicleHash)vehicle.Model == VehicleHash.Velum || (VehicleHash)vehicle.Model == VehicleHash.Velum2 && player.GetUser().PilotSkill < 300) + if ((VehicleHash)vehicle.Model == VehicleHash.Velum || (VehicleHash)vehicle.Model == VehicleHash.Velum2 && player.GetUser().PilotSkill < 300 || !player.IsAdminDuty()) { player.SetData("JobVehicleFrei", true); player.StopAnimation(); player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skill Level(2)!"); return; } - if ((VehicleHash)vehicle.Model == VehicleHash.Coach && player.GetUser().BusSkill < 300) + if ((VehicleHash)vehicle.Model == VehicleHash.Coach && player.GetUser().BusSkill < 300 || !player.IsAdminDuty()) { player.SetData("JobVehicleFrei", true); player.StopAnimation(); player.SendNotification("~y~[JOB] ~r~Du besitzt nicht das nötige Skill Level(2)!"); return; } - if ((VehicleHash)vehicle.Model == VehicleHash.Tourbus && player.GetUser().BusSkill < 800) + if ((VehicleHash)vehicle.Model == VehicleHash.Tourbus && player.GetUser().BusSkill < 800 || !player.IsAdminDuty()) { player.SetData("JobVehicleFrei", true); player.StopAnimation(); diff --git a/ReallifeGamemode.Server/Events/ResourceStop.cs b/ReallifeGamemode.Server/Events/ResourceStop.cs index 78d82b25..c95063e0 100644 --- a/ReallifeGamemode.Server/Events/ResourceStop.cs +++ b/ReallifeGamemode.Server/Events/ResourceStop.cs @@ -3,7 +3,6 @@ using GTANetworkAPI; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; -using System.Linq; /** * @overview Life of German Reallife - Event ResourceStop (ResourceStop.cs) diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index 7c5d9009..fa2b3d63 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -14,7 +14,6 @@ using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Services; -using Newtonsoft.Json; using ReallifeGamemode.Server.Wanted; namespace ReallifeGamemode.Server.Finance diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs index d58ff39f..b9e15f53 100644 --- a/ReallifeGamemode.Server/Job/BusDriverJob.cs +++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs @@ -8,6 +8,8 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Util; +using ReallifeGamemode.Database.Entities; + namespace ReallifeGamemode.Server.Job { @@ -21,73 +23,74 @@ namespace ReallifeGamemode.Server.Job private readonly IReadOnlyCollection Skill1Route1 = new List//Bus_Skill_1_Route_1 { - new Vector3(-1018.1577758789062, -2732.403564453125, 13.658967971801758), - new Vector3(-153.04013061523438, -2033.8385009765625, 22.712543487548828), - new Vector3(50.42457580566406, -1536.9090576171875, 29.184476852416992), - new Vector3(361.1451721191406, -1064.6044921875, 29.36113166809082), - new Vector3(119.01465606689453, -785.609619140625, 31.267763137817383), - new Vector3(-172.00689697265625, -815.9910888671875, 31.13607406616211), - new Vector3(-707.7088623046875, -826.9969482421875, 23.451000213623047), - new Vector3(-658.1038818359375, -1393.321533203125, 10.509778022766113), - new Vector3(-1018.1826171875, -2732.371826171875, 13.656649589538574), - new Vector3(-647.2696533203125, -2215.64501953125, 5.989798069000244), + new Vector3(-1018.1577758789062, -2732.403564453125, 10.658967971801758), + new Vector3(-153.04013061523438, -2033.8385009765625, 19.712543487548828), + new Vector3(50.42457580566406, -1536.9090576171875, 26.184476852416992), + new Vector3(361.1451721191406, -1064.6044921875, 26.36113166809082), + new Vector3(119.01465606689453, -785.609619140625, 28.267763137817383), + new Vector3(-172.00689697265625, -815.9910888671875, 28.13607406616211), + new Vector3(-707.7088623046875, -826.9969482421875, 20.451000213623047), + new Vector3(-658.1038818359375, -1393.321533203125, 7.509778022766113), + new Vector3(-1018.1826171875, -2732.371826171875, 10.656649589538574), + new Vector3(-647.2696533203125, -2215.64501953125, 2.989798069000244), }.AsReadOnly(); private readonly IReadOnlyCollection Skill1Route2 = new List//Bus_Skill_1_Route_2 { - new Vector3(-567.6445922851562, -1233.4453125, 15.050300598144531), - new Vector3(-509.224609375, -668.373291015625, 33.02402877807617), - new Vector3(55.00559997558594, -749.8328247070312, 44.11421203613281), - new Vector3(-173.65509033203125, -152.5533905029297, 43.615516662597656), - new Vector3(-523.8310546875, -266.884033203125, 35.291507720947266), - new Vector3(-1167.646728515625, -400.75, 35.39745330810547), - new Vector3(-1408.329345703125, -567.8721923828125, 30.22767448425293), - new Vector3(-1213.3565673828125, -1214.755859375, 7.5853986740112305), - new Vector3(-746.8554077148438, -2372.227783203125, 14.740862846374512), - new Vector3(-660.7366333007812, -2206.03662109375, 5.988998889923096), + new Vector3(-567.6445922851562, -1233.4453125, 12.050300598144531), + new Vector3(-509.224609375, -668.373291015625, 30.02402877807617), + new Vector3(55.00559997558594, -749.8328247070312, 41.11421203613281), + new Vector3(-173.65509033203125, -152.5533905029297, 40.615516662597656), + new Vector3(-523.8310546875, -266.884033203125, 32.291507720947266), + new Vector3(-1167.646728515625, -400.75, 32.39745330810547), + new Vector3(-1408.329345703125, -567.8721923828125, 27.22767448425293), + new Vector3(-1213.3565673828125, -1214.755859375, 4.5853986740112305), + new Vector3(-746.8554077148438, -2372.227783203125, 11.740862846374512), + new Vector3(-660.7366333007812, -2206.03662109375, 2.988998889923096), }.AsReadOnly(); private readonly IReadOnlyCollection Skill1Route3 = new List//Bus_Skill_1_Route_3 { - new Vector3(423.4793395996094, -2143.4169921875, 18.23659896850586), - new Vector3(875.1618041992188, -1766.7913818359375, 29.780052185058594), - new Vector3(1166.110107421875, -1422.72265625, 34.477935791015625), - new Vector3(807.715087890625, -1356.7987060546875, 26.29298210144043), - new Vector3(785.9387817382812, -780.5958251953125, 26.333005905151367), - new Vector3(895.2793579101562, 55.24346923828125, 78.82550048828125), - new Vector3(775.8052368164062, 596.2352905273438, 125.77734375), - new Vector3(307.64422607421875, -762.0469360351562, 29.197702407836914), - new Vector3(-105.66091918945312, -1683.9630126953125, 29.190542221069336), - new Vector3(-644.0516967773438, -2218.673828125, 5.991928577423096), + new Vector3(423.4793395996094, -2143.4169921875, 15.23659896850586), + new Vector3(875.1618041992188, -1766.7913818359375, 26.780052185058594), + new Vector3(1166.110107421875, -1422.72265625, 31.477935791015625), + new Vector3(807.715087890625, -1356.7987060546875, 23.29298210144043), + new Vector3(785.9387817382812, -780.5958251953125, 23.333005905151367), + new Vector3(895.2793579101562, 55.24346923828125, 75.82550048828125), + new Vector3(775.8052368164062, 596.2352905273438, 122.77734375), + new Vector3(307.64422607421875, -762.0469360351562, 26.197702407836914), + new Vector3(-105.66091918945312, -1683.9630126953125, 26.190542221069336), + new Vector3(-644.0516967773438, -2218.673828125, 2.991928577423096), }.AsReadOnly(); private readonly IReadOnlyCollection Skill1Route4 = new List//Bus_Skill_1_Route_4 { - new Vector3(-694.1781616210938, -1199.3873291015625, 10.50633716583252), - new Vector3(-1408.264892578125, -567.5278930664062, 30.21875), - new Vector3(-1681.6112060546875, -503.3702392578125, 37.79117965698242), - new Vector3(-1427.05712890625, -90.17198181152344, 52.015113830566406), - new Vector3(-686.4015502929688, -374.3297424316406, 34.17094802856445), - new Vector3(-509.60107421875, -668.41796875, 33.02873229980469), - new Vector3(234.6927032470703, -857.5449829101562, 29.747934341430664), - new Vector3(787.8258666992188, -1364.9345703125, 26.424083709716797), - new Vector3(825.1477661132812, -1634.5733642578125, 30.521774291992188), - new Vector3(-105.38816833496094, -1683.646728515625, 29.19083023071289), - new Vector3(-655.6530151367188, -2209.579345703125, 5.98785924911499), + new Vector3(-694.1781616210938, -1199.3873291015625, 7.50633716583252), + new Vector3(-1408.264892578125, -567.5278930664062, 27.21875), + new Vector3(-1681.6112060546875, -503.3702392578125, 34.79117965698242), + new Vector3(-1427.05712890625, -90.17198181152344, 49.015113830566406), + new Vector3(-686.4015502929688, -374.3297424316406, 31.17094802856445), + new Vector3(-509.60107421875, -668.41796875, 30.02873229980469), + new Vector3(234.6927032470703, -857.5449829101562, 26.747934341430664), + new Vector3(787.8258666992188, -1364.9345703125, 23.424083709716797), + new Vector3(825.1477661132812, -1634.5733642578125, 27.521774291992188), + new Vector3(-105.38816833496094, -1683.646728515625, 26.19083023071289), + new Vector3(-655.6530151367188, -2209.579345703125, 2.98785924911499), }.AsReadOnly(); private readonly IReadOnlyCollection Skill2Route1 = new List//Bus_Skill_2_Route_1 { - new Vector3(-1042.6405029296875, -2718.244384765625, 14.493847846984863), - new Vector3(832.205322265625, -11.559977531433105, 79.72754669189453), - new Vector3(2563.96826171875, 2633.976806640625, 37.279945373535156), - new Vector3(1684.845947265625, 6402.1533203125, 30.877294540405273), - new Vector3(-170.82965087890625, 6374.9560546875, 30.695466995239258), - new Vector3(-1524.5302734375, 4998.1220703125, 62.54846954345703), - new Vector3(-3234.168701171875, 974.0481567382812, 12.890801429748535), - new Vector3(-1331.8995361328125, -1052.2794189453125, 7.4408793449401855), + new Vector3(-1042.6405029296875, -2718.244384765625, 9.493847846984863), + new Vector3(832.205322265625, -11.559977531433105, 76.72754669189453), + new Vector3(2563.96826171875, 2633.976806640625, 35.279945373535156), + new Vector3(1684.845947265625, 6402.1533203125, 28.877294540405273), + new Vector3(-170.82965087890625, 6374.9560546875, 28.695466995239258), + new Vector3(-1524.5302734375, 4998.1220703125, 60.54846954345703), + new Vector3(-3234.168701171875, 974.0481567382812, 10.890801429748535), + new Vector3(-1331.8995361328125, -1052.2794189453125, 5.4408793449401855), + new Vector3(-647.2696533203125, -2215.64501953125, 2.989798069000244), }.AsReadOnly(); private readonly IReadOnlyCollection Skill2Route2 = new List//Bus_Skill_2_Route_2 { @@ -429,8 +432,63 @@ namespace ReallifeGamemode.Server.Job player.SendChatMessage("~y~[JOB] ~w~Die neue Route Lädt. Bitte Warten..."); NAPI.Task.Run(() => { - player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15); - c.StartBusRoute(player, "RouteStart"); + if (player.VehicleSeat == 0) + { + player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15); + c.StartBusRoute(player, "RouteStart"); + } + else + { + Vehicle LastVehicle = player.GetData("LastVehicle"); + JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1); + if (LastVehicle.GetServerVehicle() is JobVehicle vehJ) + { + if (LastVehicle.GetData("timerJobVehicleRespawn") == true) + { + if (vehJ.GetJob().GetUsersInJob().Contains(player)) + { + if (LastVehicle != null) + { + LastVehicle.ResetData("timerJobVehicleRespawn"); + ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(LastVehicle); + ServerVehicleExtensions.Spawn(sVeh, LastVehicle); + job.StopJob(player); + ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet."); + CheckPointHandle.DeleteCheckpoints(player); + if (!player.HasData("isDead") || player.GetData("isDead") == false) + { + if (player.GetUser().JobId == 1)//Taxifahrer + { + //VehicleManager.DeleteVehicle(v); + } + if (player.GetUser().JobId == 2)//Müllmann + { + //VehicleManager.DeleteVehicle(v); + } + if (player.GetUser().JobId == 3)//Pilot + { + if (!player.HasData("PilotenBase") || player.GetData("PilotenBase") == 1) //Sandyshores + { + player.Position = new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406); + player.Heading = (-154.65234375f); + } + if (player.HasData("PilotenBase") && player.GetData("PilotenBase") == 2) //LS Airport + { + player.Position = new Vector3(-1622.48, -3151.58, 13); + player.Heading = (48.44f); + } + } + if (player.GetUser().JobId == 4)//Busfahrer + { + player.Position = new Vector3(-535.46, -2144.97, 5.95); + player.Heading = (57.03f); + } + } + } + } + } + } + } /*if (v.Model == (uint)Types.VehicleModel.Bus) { player.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/FahrplanAbfahrt", "wav", 15); diff --git a/ReallifeGamemode.Server/Job/PilotJob.cs b/ReallifeGamemode.Server/Job/PilotJob.cs index b951e9fc..53450ce3 100644 --- a/ReallifeGamemode.Server/Job/PilotJob.cs +++ b/ReallifeGamemode.Server/Job/PilotJob.cs @@ -51,38 +51,44 @@ namespace ReallifeGamemode.Server.Job private readonly IReadOnlyCollection Skill2Route1 = new List//Pilot_Skill_2_Route_1 { - new Vector3(-1563.0125732421875, -3019.960205078125, 14.879448890686035), - new Vector3(-606.9600830078125, -2660.677490234375, 136.10226440429688), - new Vector3(734.489990234375, -967.21533203125, 604.9561157226562), - new Vector3(107.65938568115234, 1202.3692626953125, 972.5994873046875), - new Vector3(67.48933410644531, 3056.564697265625, 865.25537109375), - new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406), - new Vector3(1731.6995849609375, 3308.203125, 41.223514556884766), - new Vector3(1106.1397705078125, 3090.18798828125, 74.03556823730469), - new Vector3(41.88761901855469, 1728.1295166015625, 446.2645568847656), - new Vector3(-1144.333984375, -943.0862426757812, 376.0502624511719), - new Vector3(-1406.51220703125, -2334.29052734375, 50.125667572021484), - new Vector3(-1590.4517822265625, -2996.38330078125, 13.94474983215332), - new Vector3(-1666.028076171875, -3082.910888671875, 13.944761276245117), + new Vector3(-1534.98828125, -3028.916748046875, 14.451109886169434), + new Vector3(-1182.960205078125, -3236.542724609375, 67.93492126464844), + new Vector3(942.8041381835938, -2997.95751953125, 323.1705322265625), + new Vector3(2459.114501953125, -525.8928833007812, 409.09002685546875), + new Vector3(2764.611572265625, 1482.853271484375, 457.73944091796875), + new Vector3(3485.380615234375, 3652.9619140625, 343.3283996582031), + new Vector3(2652.611572265625, 4737.7958984375, 206.23399353027344), + new Vector3(2043.8521728515625, 4769.595703125, 42.007118225097656), + new Vector3(2134.332763671875, 4781.857421875, 41.900352478027344), + new Vector3(1943.1544189453125, 4721.03125, 57.76427459716797), + new Vector3(1749.4105224609375, 3790.8955078125, 194.40440368652344), + new Vector3(1203.5526123046875, 2707.182373046875, 342.80145263671875), + new Vector3(-377.686279296875, 1256.92578125, 532.7467651367188), + new Vector3(-820.6907958984375, -412.96466064453125, 311.0726013183594), + new Vector3(-1073.534912109375, -1704.798583984375, 94.05522155761719), + new Vector3(-1686.30126953125, -2815.478759765625, 14.87234115600586), + new Vector3(-1617.498291015625, -2982.41259765625, 14.883989334106445), }.AsReadOnly(); private readonly IReadOnlyCollection Skill2Route2 = new List//Pilot_Skill_2_Route_2 { - new Vector3(-1412.8221435546875, -3044.2587890625, 14.887921333312988), - new Vector3(-1627.982177734375, -2714.71875, 14.880501747131348), - new Vector3(-1309.5150146484375, -2030.012451171875, 120.04487609863281), - new Vector3(-1079.538330078125, -325.4757385253906, 435.19158935546875), - new Vector3(-495.6157531738281, 2248.668701171875, 800.2356567382812), - new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406), - new Vector3(1850.8380126953125, 4677.72412109375, 71.57810974121094), - new Vector3(2131.758544921875, 4782.18115234375, 40.970279693603516), - new Vector3(1963.30078125, 4726.73681640625, 52.904056549072266), - new Vector3(1168.9517822265625, 4205.9033203125, 172.29588317871094), - new Vector3(-1138.7547607421875, -1896.85498046875, 91.5819091796875), - new Vector3(-1551.466064453125, -2706.53125, 13.945389747619629), - new Vector3(-1571.1328125, -2856.3505859375, 13.944441795349121), - new Vector3(-1582.531005859375, -2999.940185546875, 13.936454772949219), - new Vector3(-1668.747802734375, -3081.548095703125, 13.9447660446167), + new Vector3(-1463.965576171875, -2875.571533203125, 14.882678031921387), + new Vector3(-981.0889282226562, -3122.533203125, 56.10537338256836), + new Vector3(-341.6023254394531, -2016.779541015625, 262.1709899902344), + new Vector3(-1446.6815185546875, -894.4887084960938, 321.3404846191406), + new Vector3(-3151.909912109375, 979.1404418945312, 335.3139953613281), + new Vector3(-1309.160888671875, 4903.9140625, 388.6031494140625), + new Vector3(31.35175895690918, 3690.413330078125, 333.4454345703125), + new Vector3(-948.346923828125, 2766.284912109375, 239.0842742919922), + new Vector3(-2312.5068359375, 3033.903076171875, 33.7471923828125), + new Vector3(-2132.787109375, 3265.840087890625, 33.74031448364258), + new Vector3(-2331.76611328125, 3148.581298828125, 33.7597541809082), + new Vector3(-2564.848876953125, 2369.27783203125, 182.68736267089844), + new Vector3(-1833.041259765625, 832.1589965820312, 398.28863525390625), + new Vector3(-878.19384765625, -904.84521484375, 284.2839050292969), + new Vector3(-1124.624755859375, -1821.9208984375, 74.77794647216797), + new Vector3(-1631.8602294921875, -2720.09814453125, 14.873514175415039), + new Vector3(-1543.793701171875, -2829.399169921875, 14.899491310119629), }.AsReadOnly(); private readonly IReadOnlyCollection Skill2Route3 = new List//Pilot_Skill_2_Route_3 diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index 4a0b2d6e..2652883d 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using GTANetworkAPI; using Newtonsoft.Json; +using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Services; namespace ReallifeGamemode.Server.Job @@ -224,7 +225,15 @@ namespace ReallifeGamemode.Server.Job if (target != null) { ChatService.SendMessage((Player)target, "Auto ist voll fahre nun zu Base."); target.TriggerEvent("SERVER:MuellmannZuBase"); } player.TriggerEvent("SERVER:MuellmannZuBase"); } - //bonus pro sack + if(target != null) + { + player.GetUser().Wage += 10; + target.GetUser().Wage += 10; + } + else + { + player.GetUser().Wage += 20; + } return; } } @@ -242,7 +251,15 @@ namespace ReallifeGamemode.Server.Job if (target != null) ChatService.SendMessage((Player)target, $"Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}"); ChatService.SendMessage((Player)player, $"Fahrzeug wurde entleert. Säcke: {data.getTrashCount()}"); //bonus pro sack - + if (target != null) + { + player.GetUser().Wage += 100; + target.GetUser().Wage += 100; + } + else + { + player.GetUser().Wage += 200; + } data.setTrashCount(0); Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData().Count} | Säcke: {data.getTrashCount()}"); return; diff --git a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs index 52a959d9..7d1e649d 100644 --- a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs +++ b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using GTANetworkAPI; diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 08cd4e80..2cd754dd 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -10,9 +10,6 @@ using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Services; - -using ReallifeGamemode.Server.Types; - using System.Buffers; using Microsoft.EntityFrameworkCore; using ReallifeGamemode.Server.Events; diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index 77e13636..7fb50d4b 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -11,12 +11,6 @@ using ReallifeGamemode.Server.Job; using ReallifeGamemode.Server.Services; using ReallifeGamemode.Server.Util; using ReallifeGamemode.Services; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Timers; -using System.Threading; namespace ReallifeGamemode.Server.Managers {