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

44
ReallifeGamemode.Server/Util/VehicleSync.cs
View File

@@ -233,12 +233,12 @@ namespace ReallifeGamemode.Server.Util
{
if (NAPI.Entity.DoesEntityExist(veh))
{
if (NAPI.Data.HasEntitySharedData(veh.Handle, "VehicleSyncData"))
if (NAPI.Data.HasEntitySharedData(veh, "VehicleSyncData"))
{
try
{
//API converts class objects to JObject so we have to change it back
JObject obj = NAPI.Data.GetEntitySharedData(veh.Handle, "VehicleSyncData");
JObject obj = (JObject)NAPI.Data.GetEntitySharedData(veh, "VehicleSyncData");
return obj.ToObject<VehicleSyncData>();
}
catch (Exception) { return null; }
@@ -285,7 +285,7 @@ namespace ReallifeGamemode.Server.Util
//Called from the client to sync dirt level
[RemoteEvent("VehStream_SetDirtLevel")]
public void VehStreamSetDirtLevel(Client player, Vehicle veh, float dirt)
public void VehStreamSetDirtLevel(Player player, Vehicle veh, float dirt)
{
VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData))
@@ -301,7 +301,7 @@ namespace ReallifeGamemode.Server.Util
//Called from the client to sync door data
[RemoteEvent("VehStream_SetDoorData")]
public void VehStreamSetDoorData(Client player, Vehicle veh, int door1state, int door2state, int door3state, int door4state, int door5state, int door6state, int door7state, int door8state)
public void VehStreamSetDoorData(Player player, Vehicle veh, int door1state, int door2state, int door3state, int door4state, int door5state, int door6state, int door7state, int door8state)
{
VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData))
@@ -324,7 +324,7 @@ namespace ReallifeGamemode.Server.Util
//Called from the client to sync window data
[RemoteEvent("VehStream_SetWindowData")]
public void VehStreamSetWindowData(Client player, Vehicle veh, int window1state, int window2state, int window3state, int window4state)
public void VehStreamSetWindowData(Player player, Vehicle veh, int window1state, int window2state, int window3state, int window4state)
{
VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData))
@@ -343,7 +343,7 @@ namespace ReallifeGamemode.Server.Util
//Called from the client to sync wheel data
[RemoteEvent("VehStream_SetWheelData")]
public void VehStreamSetWheelData(Client player, Vehicle veh, int wheel1state, int wheel2state, int wheel3state, int wheel4state, int wheel5state, int wheel6state, int wheel7state, int wheel8state, int wheel9state, int wheel10state)
public void VehStreamSetWheelData(Player player, Vehicle veh, int wheel1state, int wheel2state, int wheel3state, int wheel4state, int wheel5state, int wheel6state, int wheel7state, int wheel8state, int wheel9state, int wheel10state)
{
VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData))
@@ -367,7 +367,7 @@ namespace ReallifeGamemode.Server.Util
//Other events
[ServerEvent(Event.PlayerEnterVehicleAttempt)]
public void VehStreamEnterAttempt(Client player, Vehicle veh, sbyte seat)
public void VehStreamEnterAttempt(Player player, Vehicle veh, sbyte seat)
{
VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData))
@@ -378,10 +378,10 @@ namespace ReallifeGamemode.Server.Util
}
[ServerEvent(Event.PlayerExitVehicleAttempt)]
public void VehStreamExitAttempt(Client player, Vehicle veh)
public void VehStreamExitAttempt(Player player, Vehicle veh)
{
if (player.HasData("isDead") && player.GetData("isDead"))
if (player.HasData("isDead") && player.GetData<bool>("isDead"))
return;
@@ -397,9 +397,9 @@ namespace ReallifeGamemode.Server.Util
}
[ServerEvent(Event.PlayerExitVehicle)]
public void VehStreamExit(Client player, Vehicle veh)
public void VehStreamExit(Player player, Vehicle veh)
{
if (player.HasData("isDead") && player.GetData("isDead"))
if (player.HasData("isDead") && player.GetData<bool>("isDead"))
return;
VehicleSyncData data = GetVehicleSyncData(veh);
@@ -414,7 +414,7 @@ namespace ReallifeGamemode.Server.Util
}
[ServerEvent(Event.PlayerEnterVehicle)]
public void VehStreamEnter(Client player, Vehicle veh, sbyte seat)
public void VehStreamEnter(Player player, Vehicle veh, sbyte seat)
{
VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData))
@@ -437,7 +437,7 @@ namespace ReallifeGamemode.Server.Util
// UpdateVehicleSyncData(veh, data);
// if (NAPI.Vehicle.GetVehicleDriver(veh) != default(Client)) //Doesn't work?
// if (NAPI.Vehicle.GetVehicleDriver(veh) != default(Player)) //Doesn't work?
// NAPI.ClientEvent.TriggerClientEvent(NAPI.Vehicle.GetVehicleDriver(veh), "VehStream_PlayerExitVehicleAttempt", veh);
//}
@@ -458,12 +458,12 @@ namespace ReallifeGamemode.Server.Util
// INDICATORS
[RemoteEvent("CLIENT:toggleLeftIndicator")]
public void ToggleLeftIndicator(Client player)
public void ToggleLeftIndicator(Player player)
{
if (!player.IsInVehicle || player.VehicleSeat != -1) return;
if (!player.IsInVehicle || player.VehicleSeat != 0) return;
Vehicle veh = player.Vehicle;
if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData();
if (!(veh.GetData<IndicatorData>("indicatorData") is IndicatorData data)) data = new IndicatorData();
if (data.Left && data.Right)
{
@@ -480,12 +480,12 @@ namespace ReallifeGamemode.Server.Util
}
[RemoteEvent("CLIENT:toggleRightIndicator")]
public void ToggleRightIndicator(Client player)
public void ToggleRightIndicator(Player player)
{
if (!player.IsInVehicle || player.VehicleSeat != -1) return;
if (!player.IsInVehicle || player.VehicleSeat != 0) return;
Vehicle veh = player.Vehicle;
if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData();
if (!(veh.GetData<IndicatorData>("indicatorData") is IndicatorData data)) data = new IndicatorData();
if (data.Left && data.Right)
{
@@ -502,12 +502,12 @@ namespace ReallifeGamemode.Server.Util
}
[RemoteEvent("CLIENT:toggleWarningIndicator")]
public void ToggleWarningIndicator(Client player)
public void ToggleWarningIndicator(Player player)
{
if (!player.IsInVehicle || player.VehicleSeat != -1) return;
if (!player.IsInVehicle || player.VehicleSeat != 0) return;
Vehicle veh = player.Vehicle;
if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData();
if (!(veh.GetData<IndicatorData>("indicatorData") is IndicatorData data)) data = new IndicatorData();
if (data.Right && data.Left)
{