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

fix

Browse Source
This commit is contained in:
Lukas Moungos
2019-11-01 22:37:55 +01:00
parent b2d0a35d48
commit 2d10b54405
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
View File

@@ -34,7 +34,6 @@ namespace ReallifeGamemode.Server.DrivingSchool
new Vector3(-233.65, -1133.09, 21.52), new Vector3(-233.65, -1133.09, 21.52),
new Vector3(-511.5, -1079.99, 21.37), new Vector3(-511.5, -1079.99, 21.37),
new Vector3(-707.52, -1239.48, 8.91), new Vector3(-707.52, -1239.48, 8.91),
new Vector3(-788.42, -1318.54, 3.49),
}.AsReadOnly(); }.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> StopBike = new List<Vector3> private readonly IReadOnlyCollection<Vector3> StopBike = new List<Vector3>
@@ -143,13 +142,13 @@ namespace ReallifeGamemode.Server.DrivingSchool
if (veh.GetServerVehicle() is SchoolVehicle schoolVehicle) if (veh.GetServerVehicle() is SchoolVehicle schoolVehicle)
{ {
if (schoolVehicle.SchoolId == 0) if (schoolVehicle.SchoolId == 0 && user.IsInVehicle && user.VehicleSeat == -1)
{ {
user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen."); user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen.");
user.TriggerEvent("stopTimer"); user.TriggerEvent("stopTimer");
CheckPointHandle.StartCheckPointRoute(user, DrivingRoute, 0, 1, 7, "drivingSchoolEvent"); CheckPointHandle.StartCheckPointRoute(user, DrivingRoute, 0, 1, 7, "drivingSchoolEvent");
} }
if(schoolVehicle.SchoolId == 2) if(schoolVehicle.SchoolId == 2 && user.IsInVehicle && user.VehicleSeat == -1)
{ {
user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen."); user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen.");
user.TriggerEvent("stopTimer"); user.TriggerEvent("stopTimer");
@@ -267,7 +266,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{ {
user.TriggerEvent("renderTextOnScreen", "Sollten Sie aus dem Fahrzeug aussteigen fallen Sie durch."); user.TriggerEvent("renderTextOnScreen", "Sollten Sie aus dem Fahrzeug aussteigen fallen Sie durch.");
} }
else if (checkpoint == 13) else if (checkpoint == 11)
{ {
user.TriggerEvent("renderTextOnScreen", "Parke nun das Auto an der markierten Stelle."); user.TriggerEvent("renderTextOnScreen", "Parke nun das Auto an der markierten Stelle.");
CheckPointHandle.StartCheckPointRoute(user, StopBike, 5000, 1, 7, "bikeSchoolEventEnd"); CheckPointHandle.StartCheckPointRoute(user, StopBike, 5000, 1, 7, "bikeSchoolEventEnd");

3
ReallifeGamemode.Server/Managers/VehicleManager.cs
View File

@@ -694,7 +694,8 @@ namespace ReallifeGamemode.Server.Managers
"polbullet", "polbullet",
"polbullet2", "polbullet2",
"sherbullet", "sherbullet",
"hwaybullet" "hwaybullet",
"argento"
}; };
private static readonly Dictionary<int, NetHandle> _serverVehicles = new Dictionary<int, NetHandle>(); private static readonly Dictionary<int, NetHandle> _serverVehicles = new Dictionary<int, NetHandle>();