From fbca9ba8e1c22d4b1f2d609edd947553e516725f Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Fri, 1 Nov 2019 19:54:15 +0100 Subject: [PATCH] Hotfix --- ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs | 6 +----- ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs | 10 ++++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs index 225fe9aa..7a2bf2f6 100644 --- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs @@ -115,11 +115,7 @@ namespace ReallifeGamemode.Server.DrivingSchool { Vehicle veh = user.Vehicle; - if (veh == null || veh.DisplayName != "Premier") - { - return; - } - else + if (veh.GetServerVehicle() is SchoolVehicle schoolVehicle) { user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen."); user.TriggerEvent("stopTimer"); diff --git a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs index 0dc3bc12..4f373489 100644 --- a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs @@ -71,6 +71,8 @@ namespace ReallifeGamemode.Server.DrivingSchool [RemoteEvent("startplaneSchool")] public void StartplaneSchool(Client client) { + User user = client.GetUser(); + if (user.Handmoney < 5000) { client.SendNotification("~r~Du brauchst ~g~$5000~r~ auf der Hand um die Prüfung zu starten.", true); @@ -83,7 +85,7 @@ namespace ReallifeGamemode.Server.DrivingSchool dbContext.SaveChanges(); } - User user = client.GetUser(); + if (user.FlyingLicensePlane || client.HasData("ActiveSchool")) return; client.SetData("ActiveSchool", 1); @@ -96,11 +98,7 @@ namespace ReallifeGamemode.Server.DrivingSchool { Vehicle veh = user.Vehicle; - if (veh == null || veh.DisplayName != "Velum") - { - return; - } - else + if (veh.GetServerVehicle() is SchoolVehicle schoolVehicle) { user.TriggerEvent("renderTextOnScreen", "Fahren Sie langsam und sicher zur Roten Markierung."); user.TriggerEvent("stopTimer");