diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index 5eb64c94..4204bcc9 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -175,4 +175,4 @@ import planeSchoolHandle from './util/planeschool'; planeSchoolHandle(globalData); import PilotRouteList from './Jobs/PilotRouteSelect'; -PilotRouteList(globalData); \ No newline at end of file +PilotRouteList(globalData); diff --git a/ReallifeGamemode.Database/Entities/User.cs b/ReallifeGamemode.Database/Entities/User.cs index f240ef4d..9761714a 100644 --- a/ReallifeGamemode.Database/Entities/User.cs +++ b/ReallifeGamemode.Database/Entities/User.cs @@ -90,6 +90,8 @@ namespace ReallifeGamemode.Database.Entities public int PaydayTimer { get; set; } + public bool DriverLicenseVehicle { get; set; } + public bool IsAdmin(AdminLevel level) => AdminLevel >= level; public IBankAccount GetBankAccount(DatabaseContext databaseContext = null) diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs index 72a19ab4..258eca20 100644 --- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs @@ -6,6 +6,7 @@ using ReallifeGamemode.Server.Util; using ReallifeGamemode.Server.Services; using System.Linq; using GTANetworkAPI; +using ReallifeGamemode.Database.Entities; namespace ReallifeGamemode.Server.DrivingSchool { @@ -89,12 +90,16 @@ namespace ReallifeGamemode.Server.DrivingSchool } [RemoteEvent("startDrivingSchool")] - public void StartDrivingSchool(Client user) + public void StartDrivingSchool(Client client) { - ChatService.SendMessage(user, "Du hast die Führerscheinprüfung gestartet."); - ChatService.SendMessage(user, "Steige nun in eines der Fahrschulautos"); + User user = client.GetUser(); + if (user.DriverLicenseVehicle) + return; - user.TriggerEvent("waitPlayerEntersVehicle"); + ChatService.SendMessage(client, "Du hast die Führerscheinprüfung gestartet."); + ChatService.SendMessage(client, "Steige nun in eines der Fahrschulautos"); + + client.TriggerEvent("waitPlayerEntersVehicle"); } [RemoteEvent("timerCheckVehicle")]