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

RAGE Multiplayer 1.1.0-DP Update

Browse Source 
/freeze was obselete and removed
/unfreeze was obselete and removed
/spectate was obselete and removed
This commit is contained in:
Siga
2020-02-24 21:18:54 +01:00
parent 0d5731fb11
commit edf06f4478
85 changed files with 804 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,20 +97,20 @@ namespace ReallifeGamemode.Server.DrivingSchool
NAPI.Blip.CreateBlip(545, new Vector3(-813.17, -1354.5, 5.14), 1.0f, 4, "Fahrschule", shortRange: true);
}
private static void EntityEnterBusinessColShape(ColShape colShape, Client client)
private static void EntityEnterBusinessColShape(ColShape colShape, Player client)
{
if (client.IsInVehicle || !client.IsLoggedIn()) return;
client.TriggerEvent("drivingSchoolMenu");
}
private static void EntityExitBusinessColShape(ColShape colShape, Client client)
private static void EntityExitBusinessColShape(ColShape colShape, Player client)
{
client.TriggerEvent("removeDrivingSchoolMenu");
}
[RemoteEvent("startDrivingSchool")]
public void StartDrivingSchool(Client client)
public void StartDrivingSchool(Player client)
{
User user = client.GetUser();
if (user.DriverLicenseVehicle || client.HasData("ActiveSchool"))
@@ -136,7 +136,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
}
[RemoteEvent("timerCheckVehicle")]
public void TimerCheckVehicle(Client user)
public void TimerCheckVehicle(Player user)
{
Vehicle veh = user.Vehicle;
@@ -158,7 +158,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
}
[RemoteEvent("drivingSchoolEventEnd")]
public void DrivingSchoolEventEnd(Client user, int checkpoint)
public void DrivingSchoolEventEnd(Player user, int checkpoint)
{
user.TriggerEvent("renderTextOnScreen", "Du hast den Führerschein bestanden. Glückwunsch!");
user.ResetData("ActiveSchool");
@@ -183,7 +183,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
[RemoteEvent("drivingSchoolEvent")]
public void DrivingSchoolEvent(Client user, int checkpoint)
public void DrivingSchoolEvent(Player user, int checkpoint)
{
if (checkpoint == 0)
{
@@ -208,7 +208,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
[RemoteEvent("startBikeSchool")]
public void StartBikeSchool(Client client)
public void StartBikeSchool(Player client)
{
User user = client.GetUser();
if (user.DriverLicenseBike || client.HasData("ActiveSchool"))
@@ -235,7 +235,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
[RemoteEvent("bikeSchoolEventEnd")]
public void bikeSchoolEventEnd(Client user, int checkpoint)
public void bikeSchoolEventEnd(Player user, int checkpoint)
{
user.TriggerEvent("renderTextOnScreen", "Du hast den Führerschein bestanden. Glückwunsch!");
user.ResetData("ActiveSchool");
@@ -260,7 +260,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
[RemoteEvent("bikeSchoolEvent")]
public void bikeSchoolEvent(Client user, int checkpoint)
public void bikeSchoolEvent(Player user, int checkpoint)
{
if (checkpoint == 0)
{

12
ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
View File

@@ -56,20 +56,20 @@ namespace ReallifeGamemode.Server.DrivingSchool
_colShape1.OnEntityExitColShape += EntityExitBusinessColShape;
NAPI.Blip.CreateBlip(90, new Vector3(-1083.96, -2476.96, 14.07), 1.0f, 4, "Flugschule", shortRange: true);
}
private static void EntityEnterBusinessColShape(ColShape colShape, Client client)
private static void EntityEnterBusinessColShape(ColShape colShape, Player client)
{
if (client.IsInVehicle || !client.IsLoggedIn()) return;
client.TriggerEvent("planeSchoolMenu");
}
private static void EntityExitBusinessColShape(ColShape colShape, Client client)
private static void EntityExitBusinessColShape(ColShape colShape, Player client)
{
client.TriggerEvent("removeplaneSchoolMenu");
}
[RemoteEvent("startplaneSchool")]
public void StartplaneSchool(Client client)
public void StartplaneSchool(Player client)
{
User user = client.GetUser();
@@ -95,7 +95,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
}
[RemoteEvent("timerCheckVehicle1")]
public void TimerCheckVehicle1(Client user)
public void TimerCheckVehicle1(Player user)
{
Vehicle veh = user.Vehicle;
@@ -111,7 +111,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
}
[RemoteEvent("planeSchoolEventEnd")]
public void planeSchoolEventEnd(Client user, int checkpoint)
public void planeSchoolEventEnd(Player user, int checkpoint)
{
Vehicle veh = user.Vehicle;
user.WarpOutOfVehicle();
@@ -133,7 +133,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
user.Position = new Vector3(-1083.96, -2476.96, 13.07);
}
[RemoteEvent("planeSchoolEvent")]
public void planeSchoolEvent(Client user, int checkpoint)
public void planeSchoolEvent(Player user, int checkpoint)
{
switch (checkpoint)
{