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

12
ReallifeGamemode.Server/Util/CheckPointHandle.cs
View File

@@ -8,13 +8,13 @@ namespace ReallifeGamemode.Server.Util
{
public static List<CheckPointListForPlayer> listHandle = new List<CheckPointListForPlayer>();
public static void DeleteCheckpoints(Client player)
public static void DeleteCheckpoints(Player player)
{
RemovePlayerHandlerFromList(player);
player.TriggerEvent("destroyCP");
}
public static void StartCheckPointRoute(Client player, IEnumerable<Vector3> nListCps, int delay, int markerID, int markerSize, string nEvent)
public static void StartCheckPointRoute(Player player, IEnumerable<Vector3> nListCps, int delay, int markerID, int markerSize, string nEvent)
{
RemovePlayerHandlerFromList(player);
CheckPointListForPlayer playerHandle = new CheckPointListForPlayer(player, nListCps, delay, markerID, markerSize, nEvent);
@@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Util
playerHandle.StartRoute();
}
public static void RemovePlayerHandlerFromList(Client player)
public static void RemovePlayerHandlerFromList(Player player)
{
CheckPointListForPlayer temp = null;
for (int a = 0; a < listHandle.Count; a++)
@@ -38,7 +38,7 @@ namespace ReallifeGamemode.Server.Util
}
[RemoteEvent("playerInCheckpoint")]
public void PlayerInCheckpoint(Client user)
public void PlayerInCheckpoint(Player user)
{
CheckPointListForPlayer temp = null;
for (int a = 0; a < listHandle.Count; a++)
@@ -56,7 +56,7 @@ namespace ReallifeGamemode.Server.Util
public class CheckPointListForPlayer
{
public IEnumerable<Vector3> list = new List<Vector3>();
public Client player;
public Player player;
public int delay = 0;
public int markerID;
public int markerSize;
@@ -64,7 +64,7 @@ namespace ReallifeGamemode.Server.Util
int checkPointsDone = 0;
public CheckPointListForPlayer(Client nPlayer, IEnumerable<Vector3> nList, int nDelay, int nMarkerID, int nMarkerSize, string nEvent)
public CheckPointListForPlayer(Player nPlayer, IEnumerable<Vector3> nList, int nDelay, int nMarkerID, int nMarkerSize, string nEvent)
{
this.player = nPlayer;
this.list = nList;

4
ReallifeGamemode.Server/Util/GlobalHelper.cs
View File

@@ -8,8 +8,8 @@ namespace ReallifeGamemode.Server.Util
{
public static class GlobalHelper
{
public static List<Client> DutyAdmins = new List<Client>();
public static List<Client> tsupAdmins = new List<Client>();
public static List<Player> DutyAdmins = new List<Player>();
public static List<Player> tsupAdmins = new List<Player>();
public static Dictionary<string, string> CustomJoinMessages = new Dictionary<string, string>
{

14
ReallifeGamemode.Server/Util/SmoothThrottle.cs
View File

@@ -1,17 +1,17 @@
using GTANetworkAPI;
using GTANetworkAPI;
namespace ReallifeGamemode.Server.Util
{
public class SmoothThrottleAntiReverse : Script
{
[ServerEvent(Event.PlayerExitVehicle)]
public void SmoothThrottleExitEvent(Client player, Vehicle veh)
public void SmoothThrottleExitEvent(Player player, Vehicle veh)
{
NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_PlayerExitVehicle", veh);
}
[ServerEvent(Event.PlayerEnterVehicle)]
public void SmoothThrottleEnterEvent(Client player, Vehicle veh, sbyte seat)
public void SmoothThrottleEnterEvent(Player player, Vehicle veh, sbyte seat)
{
NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_PlayerEnterVehicle", veh, seat);
}
@@ -20,21 +20,21 @@ namespace ReallifeGamemode.Server.Util
//Note that these are toggles, you only need to call them once.
//This disables/enables the smooth throttle
public static void SetSmoothThrottle(Client player, bool turnedOn)
public static void SetSmoothThrottle(Player player, bool turnedOn)
{
NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_SetSmoothThrottle", turnedOn);
}
//This disables/enables anti reverse
public static void SetAntiReverse(Client player, bool turnedOn)
public static void SetAntiReverse(Player player, bool turnedOn)
{
NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_SetAntiReverse", turnedOn);
}
//This disables/enables both
public static void SetSmoothThrottleAntiReverse(Client player, bool turnedOn)
public static void SetSmoothThrottleAntiReverse(Player player, bool turnedOn)
{
NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_SetGlobal", turnedOn);
}
}
}
}

2
ReallifeGamemode.Server/Util/TaxiContract.cs
View File

@@ -11,6 +11,6 @@ namespace ReallifeGamemode.Server.Util
public Vector3 Position { get; set; }
public Client Driver { get; set; }
public Player Driver { get; set; }
}
}

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)
{