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

20
ReallifeGamemode.Server/Managers/JobManager.cs
View File

@@ -46,7 +46,7 @@ namespace ReallifeGamemode.Server.Managers
public static List<JobBase> GetJobs() => _jobs.OrderBy(j => j.Id).ToList();
[RemoteEvent("CLIENT:JobCenter_CancelJob")]
public void CancelJobEvent(Client player)
public void CancelJobEvent(Player player)
{
using (var dbContext = new DatabaseContext())
{
@@ -69,7 +69,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:JobCenter_AcceptJob")]
public void AcceptJobEvent(Client player, int jobId)
public void AcceptJobEvent(Player player, int jobId)
{
using (var dbContext = new DatabaseContext())
{
@@ -100,7 +100,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:JobManager_ShowJobMenu")]
public void ShowJobMenuEvent(Client player)
public void ShowJobMenuEvent(Player player)
{
User u = player.GetUser();
@@ -153,7 +153,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:Job_StartJob")]
public void StartJobEvent(Client player)
public void StartJobEvent(Player player)
{
User u = player.GetUser();
@@ -177,7 +177,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:Job_StopJob")]
public void StopJob(Client player)
public void StopJob(Player player)
{
User u = player.GetUser();
@@ -200,7 +200,7 @@ namespace ReallifeGamemode.Server.Managers
}
[ServerEvent(Event.PlayerExitVehicle)]
public void JobManagerPlayerExitVehicle(Client player, Vehicle veh)
public void JobManagerPlayerExitVehicle(Player player, Vehicle veh)
{
User u = player.GetUser();
@@ -216,7 +216,7 @@ namespace ReallifeGamemode.Server.Managers
}
[ServerEvent(Event.PlayerEnterVehicle)]
public void JobManagerPlayerEnterVehicle(Client player, Vehicle veh, sbyte seat)
public void JobManagerPlayerEnterVehicle(Player player, Vehicle veh, sbyte seat)
{
ServerVehicle sVeh = veh.GetServerVehicle();
if (sVeh == null) return;
@@ -230,7 +230,7 @@ namespace ReallifeGamemode.Server.Managers
var contract = taxiContracts.First();
taxiJob.TaxiContracts.Remove(contract);
Client driver = veh.GetDriver();
Player driver = veh.GetDriver();
if (driver != null && contract.Driver.Handle != veh.GetDriver().Handle)
{
@@ -241,7 +241,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:JobManager_TaxiJob_AcceptCall")]
public void TaxiJobAcceptCall(Client player, string name)
public void TaxiJobAcceptCall(Player player, string name)
{
var taxiJob = JobManager.GetJob<TaxiDriverJob>();
@@ -253,7 +253,7 @@ namespace ReallifeGamemode.Server.Managers
var job = taxiJob.TaxiContracts.Where(t => t.Name == name).First();
var target = ClientService.GetClientByNameOrId(name);
var target = PlayerService.GetPlayerByNameOrId(name);
if (target == null)
{
taxiJob.TaxiContracts.Remove(job);