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

2
ReallifeGamemode.Server/Events/Chat.cs
View File

@@ -7,7 +7,7 @@ namespace ReallifeGamemode.Server.Events
public class Chat : Script
{
[ServerEvent(Event.ChatMessage)]
public void ChatEvent(Client player, string message)
public void ChatEvent(Player player, string message)
{
string serverMsg = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
if (serverMsg.Trim().Length == 0) return;

5
ReallifeGamemode.Server/Events/Connect.cs
View File

@@ -18,11 +18,10 @@ namespace ReallifeGamemode.Server.Events
class Connect : Script
{
[ServerEvent(Event.PlayerConnected)]
public void OnPlayerConnected(Client player)
public void OnPlayerConnected(Player player)
{
player.SetData("isLoggedIn", false);
player.Position = new Vector3(-1883.736, -781.4911, -10);
player.FreezePosition = true;
using (var dbContext = new DatabaseContext())
@@ -49,7 +48,7 @@ namespace ReallifeGamemode.Server.Events
}
private bool IsPlayerBanned(Client player)
private bool IsPlayerBanned(Player player)
{
using (var dbContext = new DatabaseContext())
{

4
ReallifeGamemode.Server/Events/Death.cs
View File

@@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Events
public class Death : Script
{
[ServerEvent(Event.PlayerDeath)]
public void OnPlayerDeath(Client player, Client killer, uint reason)
public void OnPlayerDeath(Player player, Player killer, uint reason)
{
if (!player.IsLoggedIn()) player.Kick();
player.SetData("isDead", true);
@@ -121,7 +121,7 @@ namespace ReallifeGamemode.Server.Events
[RemoteEvent("RespawnPlayerAtHospital")]
public void RespawnPlayerAtHospital(Client player)
public void RespawnPlayerAtHospital(Player player)
{
player.SetData("isDead", false);
player.RemoveAllWeapons();

4
ReallifeGamemode.Server/Events/Disconnect.cs
View File

@@ -22,7 +22,7 @@ namespace ReallifeGamemode.Server.Events
public class Disconnect : Script
{
[ServerEvent(Event.PlayerDisconnected)]
public void OnPlayerDisconnected(Client player, DisconnectionType type, string reason)
public void OnPlayerDisconnected(Player player, DisconnectionType type, string reason)
{
if (!player.IsLoggedIn()) return;
@@ -61,7 +61,7 @@ namespace ReallifeGamemode.Server.Events
user.PositionY = pos.Y;
user.PositionZ = pos.Z;
saveUser.SaveChanges();
user.Dead = player.HasData("isDead") ? (bool)player.GetData("isDead") : false;
user.Dead = player.HasData("isDead") ? (bool)player.GetData<bool>("isDead") : false;
}
player.SetData("isLoggedIn", false);
}

6
ReallifeGamemode.Server/Events/EnterVehicle.cs
View File

@@ -12,16 +12,16 @@ namespace ReallifeGamemode.Server.Events
public class EnterVehicle : Script
{
[ServerEvent(Event.PlayerEnterVehicle)]
public void OnPlayerEnterVehicle(Client client, GTANetworkAPI.Vehicle vehicle, sbyte seat)
public void OnPlayerEnterVehicle(Player client, GTANetworkAPI.Vehicle vehicle, sbyte seat)
{
if (seat != -1)
return;
if (vehicle.GetServerVehicle() is FactionVehicle veh)
{
if (client.GetUser().FactionId != null && (veh.FactionId == client.GetUser().FactionId) && (veh.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData("weaponDeal") == true)
if (client.GetUser().FactionId != null && (veh.FactionId == client.GetUser().FactionId) && (veh.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData<bool>("weaponDeal") == true)
{
Vector3 vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value);
if (vector == null)
if (vector == new Vector3())
return;
List<Vector3> dealPoint = new List<Vector3>();
dealPoint.Add(vector);

4
ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs
View File

@@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Events
public class EnterVehicleAttempt : Script
{
[ServerEvent(Event.PlayerEnterVehicleAttempt)]
public void OnPlayerEnterVehicleAttempt(Client player, GTANetworkAPI.Vehicle vehicle, sbyte seat)
public void OnPlayerEnterVehicleAttempt(Player player, GTANetworkAPI.Vehicle vehicle, sbyte seat)
{
if ((VehicleHash)vehicle.Model == VehicleHash.Dune3)
{
@@ -44,7 +44,7 @@ namespace ReallifeGamemode.Server.Events
player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true);
return;
}
if (sVeh.SchoolId != player.GetData("ActiveSchool"))
if (sVeh.SchoolId != player.GetData<int>("ActiveSchool"))
{
player.StopAnimation();
player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true);

4
ReallifeGamemode.Server/Events/ExitVehicle.cs
View File

@@ -13,13 +13,13 @@ namespace ReallifeGamemode.Server.Events
public class ExitVehicle : Script
{
[ServerEvent(Event.PlayerExitVehicleAttempt)]
public void OnPlayerExitVehicle(Client client, GTANetworkAPI.Vehicle vehicle)
public void OnPlayerExitVehicle(Player client, GTANetworkAPI.Vehicle vehicle)
{
if (client.VehicleSeat != -1)
return;
if (vehicle.GetServerVehicle() is FactionVehicle veh)
{
if ((client.GetUser().FactionId != null) && (veh.FactionId == client.GetUser().FactionId) && ((VehicleHash)vehicle.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData("weaponDeal") == true)
if ((client.GetUser().FactionId != null) && (veh.FactionId == client.GetUser().FactionId) && ((VehicleHash)vehicle.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData<bool>("weaponDeal") == true)
{
CheckPointHandle.RemovePlayerHandlerFromList(client);
client.TriggerEvent("destroyCP");

2
ReallifeGamemode.Server/Events/Faction.cs
View File

@@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Events
class Faction : Script
{
[RemoteEvent("OnFactionRanksEdit")]
public void OnFactionRanksEdit(Client player, string jsonData)
public void OnFactionRanksEdit(Player player, string jsonData)
{
FactionRankHelper helper = JsonConvert.DeserializeObject<FactionRankHelper>(jsonData);
using (var context = new DatabaseContext())

2
ReallifeGamemode.Server/Events/Inventory.cs
View File

@@ -16,7 +16,7 @@ namespace ReallifeGamemode.Server.Events
public class Inventory : Script
{
[RemoteEvent("getNearVehicles")]
public void SrvEvent_GetNearVehicles(Client client)
public void SrvEvent_GetNearVehicles(Player client)
{
var user = client.GetUser();
if (!client.IsInVehicle)

46
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -26,12 +26,12 @@ namespace ReallifeGamemode.Server.Events
public class Key : Script
{
[RemoteEvent("keyPress:NUM2")]
public void KeyPressNUM2(Client player)
public void KeyPressNUM2(Player player)
{
if (!player.IsLoggedIn()) return;
if (player.GetData("editmode") == true && player.GetUser().IsAdmin(AdminLevel.HEADADMIN) == true)
if (player.GetData<bool>("editmode") == true && player.GetUser().IsAdmin(AdminLevel.HEADADMIN) == true)
{
var saveMode = player.GetData("quicksavemode");
var saveMode = player.GetData<string>("quicksavemode");
switch (saveMode)
{
case "none":
@@ -56,25 +56,25 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:UP_ARROW")]
public void KeyPressUpArrow(Client player)
public void KeyPressUpArrow(Player player)
{
if (!player.IsLoggedIn()) return;
if (player.HasData("nearATM"))
{
ATMManager.ShowAtmUi(player, player.GetData("nearATM"));
ATMManager.ShowAtmUi(player, player.GetData<int>("nearATM"));
}
}
[RemoteEvent("keyPress:LEFT_ARROW")]
public void KeyPressLeftArrow(Client player)
public void KeyPressLeftArrow(Player player)
{
if (!player.IsLoggedIn()) return;
List<Client> nearbyPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(3, player);
List<Player> nearbyPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(3, player);
if (nearbyPlayers.Count > 1)
{
List<string> nearbyPlayerList = new List<string>();
foreach (Client nearPlayer in nearbyPlayers)
foreach (Player nearPlayer in nearbyPlayers)
{
if (nearPlayer.Name != player.Name)
{
@@ -90,7 +90,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:RIGHT_ARROW")]
public void KeyPressRightArrow(Client player)
public void KeyPressRightArrow(Player player)
{
if (!player.IsLoggedIn()) return;
User user = player.GetUser();
@@ -104,7 +104,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:DOWN_ARROW")]
public void KeyPressDownArrow(Client player)
public void KeyPressDownArrow(Player player)
{
User u = player.GetUser();
if (u == null) return;
@@ -136,7 +136,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:E")]
public void KeyPressE(Client player)
public void KeyPressE(Player player)
{
if (!player.IsLoggedIn()) return;
var user = player.GetUser();
@@ -164,7 +164,7 @@ namespace ReallifeGamemode.Server.Events
if (player.GetUser().FactionId == 2) //Fire Department
{
int medicCount = 0;
foreach (Client c in NAPI.Pools.GetAllPlayers())
foreach (Player c in NAPI.Pools.GetAllPlayers())
{
if ((c.GetUser()?.Faction.Id ?? 0) == 2)
{
@@ -194,7 +194,6 @@ namespace ReallifeGamemode.Server.Events
player.SetAccessories(2, 2, 0);
break;
}
player.NametagColor = nameTagColor;
using (var context = new DatabaseContext())
{
List<CharacterCloth> clothes = context.CharacterClothes.Where(u => u.UserId == user.Id && u.Duty == true).ToList();
@@ -225,7 +224,6 @@ namespace ReallifeGamemode.Server.Events
player.SendNotification("Du bist nun ~r~außer Dienst.");
player.TriggerEvent("toggleDutyMode", false);
NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", false);
player.NametagColor = new Color(255, 255, 255);
player.SetSharedData("blipColor", 0);
UpdateCharacterCloth.LoadCharacterDefaults(player);
}
@@ -306,7 +304,7 @@ namespace ReallifeGamemode.Server.Events
{
List<string> criminals = new List<string>();
criminals.Add("Keiner");
foreach (Client target in NAPI.Pools.GetAllPlayers())
foreach (Player target in NAPI.Pools.GetAllPlayers())
{
User c = target.GetUser();
if (c.JailTime > 0)
@@ -344,17 +342,17 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:I")]
public void KeyPressI(Client player)
public void KeyPressI(Player player)
{
if (!player.IsLoggedIn()) return;
InventoryManager.GetUserItems(player);
}
[RemoteEvent("keyPress:O")]
public void KeyPressJ(Client player)
public void KeyPressJ(Player player)
{
if (!player.IsLoggedIn()) return;
List<Client> players = NAPI.Pools.GetAllPlayers();
List<Player> players = NAPI.Pools.GetAllPlayers();
var listPlayers = players.Select(p => new
{
Id = p.Handle.Value,
@@ -365,7 +363,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:K")]
public void KeyPressK(Client player)
public void KeyPressK(Player player)
{
if (!player.IsLoggedIn()) return;
var user = player.GetUser();
@@ -418,19 +416,19 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:L")]
public void KeyPressL(Client player)
public void KeyPressL(Player player)
{
if (!player.IsLoggedIn()) return;
DoorManager.ChangeDoorState(player);
}
[RemoteEvent("keyPress:N")]
public void KeyPressN(Client player)
public void KeyPressN(Player player)
{
if (!player.IsLoggedIn()) return;
if (!player.IsInVehicle) return;
if (player.VehicleSeat != -1) return;
if (player.VehicleSeat != 0) return;
GTANetworkAPI.Vehicle v = player.Vehicle;
@@ -481,7 +479,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("keyPress:X")]
public void KeyPressX(Client player)
public void KeyPressX(Player player)
{
if (!player.IsLoggedIn()) return;
@@ -493,7 +491,7 @@ namespace ReallifeGamemode.Server.Events
GroundItem.PickUpGroundItem(player);
}
if (player.IsInVehicle && player.VehicleSeat == -1)
if (player.IsInVehicle && player.VehicleSeat == 0)
{
ServerVehicle veh = player.Vehicle.GetServerVehicle();
if (veh != null)

4
ReallifeGamemode.Server/Events/Login.cs
View File

@@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Events
public class Login : Script
{
[RemoteEvent("CLIENT:Login_LoginRequest")]
public void OnPlayerLogin(Client player, string username, string password)
public void OnPlayerLogin(Player player, string username, string password)
{
using (var dbContext = new DatabaseContext())
{
@@ -52,7 +52,7 @@ namespace ReallifeGamemode.Server.Events
player.SetData("spec", true);
player.SetData("duty", false);
player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney, 0);
Gangwar.Gangwar.loadClient(player);
Gangwar.Gangwar.loadPlayer(player);
if (player.GetUser().FactionLeader)
{
player.TriggerEvent("CLIENT:Turf_LoadLeaderBlip");

2
ReallifeGamemode.Server/Events/Register.cs
View File

@@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Events
class Register : Script
{
[RemoteEvent("CLIENT:Login_RegisterRequest")]
public void OnPlayerRegister(Client player, string username, string password, string passwordRepeat)
public void OnPlayerRegister(Player player, string username, string password, string passwordRepeat)
{
using (var dbContext = new DatabaseContext())
{

2
ReallifeGamemode.Server/Events/ResourceStop.cs
View File

@@ -17,7 +17,7 @@ namespace ReallifeGamemode.Server.Events
{
var users = NAPI.Pools.GetAllPlayers();
foreach (Client user in users)
foreach (Player user in users)
{
using (var saveUsers = new DatabaseContext())
{

4
ReallifeGamemode.Server/Events/Siren.cs
View File

@@ -10,9 +10,9 @@ namespace ReallifeGamemode.Server.Events
private readonly Dictionary<NetHandle, bool> _sirenStates = new Dictionary<NetHandle, bool>();
[RemoteEvent("keyPress:B:toggleSiren")]
public void ToggleSirenEvent(Client player)
public void ToggleSirenEvent(Player player)
{
if (!player.IsInVehicle || player.VehicleSeat != -1) return;
if (!player.IsInVehicle || player.VehicleSeat != 0) return;
GTANetworkAPI.Vehicle pV = player.Vehicle;
bool oldValue = _sirenStates.ContainsKey(pV.Handle) ? _sirenStates[pV.Handle] : false;
bool newValue = !oldValue;

10
ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs
View File

@@ -11,7 +11,7 @@ namespace ReallifeGamemode.Server.Events
public class UpdateCharacterCloth : Script
{
[RemoteEvent("updateDutyProp")]
public void UpdateDutyProp(Client player, int componentId, int componentVariation)
public void UpdateDutyProp(Player player, int componentId, int componentVariation)
{
if (componentId != -1)
{
@@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("updateDutyCloth")]
public void UpdateDutyCloth(Client player, int componentId, int componentVariation)
public void UpdateDutyCloth(Player player, int componentId, int componentVariation)
{
if (componentId == 11)
{
@@ -51,7 +51,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("saveCharacterCloth")]
public void SaveDutyCloth(Client client, string JSlotType, string JSlotId, string JClothId)
public void SaveDutyCloth(Player client, string JSlotType, string JSlotId, string JClothId)
{
using (var context = new DatabaseContext())
{
@@ -126,7 +126,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("defaultCharacterCloth")]
public static void LoadCharacterDefaults(Client player)
public static void LoadCharacterDefaults(Player player)
{
User user = player.GetUser();
using (var context = new DatabaseContext())
@@ -153,7 +153,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("SERVER:BuyCharacterClothes")]
public void RmtEvent_BuyClothes(Client client, string type, string jsonData)
public void RmtEvent_BuyClothes(Player client, string type, string jsonData)
{
/*
* [0] ComponentID

4
ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs
View File

@@ -9,8 +9,8 @@ namespace ReallifeGamemode.Server.Events
{
public class UpdateCharacterElevator : Script
{
[RemoteEvent("sendClientToStage")]
public void SaveWeaponSelection(Client client, string stage)
[RemoteEvent("sendPlayerToStage")]
public void SaveWeaponSelection(Player client, string stage)
{
ElevatorPoint elevator = PositionManager.ElevatorPoints.Find(e => e.Stage == stage);
if (elevator != null)

6
ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
View File

@@ -10,7 +10,7 @@ namespace ReallifeGamemode.Server.Events
public class UpdateCharacterWeapon : Script
{
[RemoteEvent("updateWeaponSelection")]
public void UpdateWeaponSelection(Client client, string weaponModel, int slot)
public void UpdateWeaponSelection(Player client, string weaponModel, int slot)
{
if (weaponModel == "Keine")
{
@@ -43,14 +43,14 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("cancelWeaponSelection")]
public void CancelWeaponSelection(Client client)
public void CancelWeaponSelection(Player client)
{
client.RemoveAllWeapons();
}
[RemoteEvent("saveWeaponSelection")]
public void SaveWeaponSelection(Client client, string primaryModel, string secondaryModel, string meleeModel, string specialModel)
public void SaveWeaponSelection(Player client, string primaryModel, string secondaryModel, string meleeModel, string specialModel)
{
client.RemoveAllWeapons();
if (!uint.TryParse(primaryModel, out uint primary))

18
ReallifeGamemode.Server/Events/Vehicle.cs
View File

@@ -11,9 +11,9 @@ namespace ReallifeGamemode.Server.Events
public class Vehicle : Script
{
[RemoteEvent("VehicleMenu_ToggleEngine")]
public void VehicleMenuToggleEngineEvent(Client player)
public void VehicleMenuToggleEngineEvent(Player player)
{
if (player.IsInVehicle && player.VehicleSeat == -1)
if (player.IsInVehicle && player.VehicleSeat == 0)
{
GTANetworkAPI.Vehicle v = player.Vehicle;
@@ -72,9 +72,9 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("VehicleMenu_LockCar")]
public static void VehicleMenuLockCarEvent(Client player)
public static void VehicleMenuLockCarEvent(Player player)
{
if (player.IsInVehicle && player.VehicleSeat == -1)
if (player.IsInVehicle && player.VehicleSeat == 0)
{
GTANetworkAPI.Vehicle v = player.Vehicle;
@@ -182,9 +182,9 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("CLIENT:VehicleMenu_ParkCar")]
public void VehicleMenuParkCarEvent(Client player)
public void VehicleMenuParkCarEvent(Player player)
{
if (player.IsInVehicle && player.VehicleSeat == -1)
if (player.IsInVehicle && player.VehicleSeat == 0)
{
GTANetworkAPI.Vehicle v = player.Vehicle;
@@ -247,7 +247,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("VehicleMenu_ToggleSingleDoor")]
public void VehicleMenuToggleSingleDoorEvent(Client player, int door)
public void VehicleMenuToggleSingleDoorEvent(Player player, int door)
{
if (!player.IsInVehicle) return;
GTANetworkAPI.Vehicle veh = player.Vehicle;
@@ -260,7 +260,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("VehicleMenu_OpenAllDoors")]
public void VehicleMenuOpenAllDoorsEvent(Client player)
public void VehicleMenuOpenAllDoorsEvent(Player player)
{
if (!player.IsInVehicle) return;
GTANetworkAPI.Vehicle veh = player.Vehicle;
@@ -272,7 +272,7 @@ namespace ReallifeGamemode.Server.Events
}
[RemoteEvent("VehicleMenu_CloseAllDoors")]
public void VehicleMenuCloseAllDoorsEvent(Client player)
public void VehicleMenuCloseAllDoorsEvent(Player player)
{
if (!player.IsInVehicle) return;
GTANetworkAPI.Vehicle veh = player.Vehicle;

4
ReallifeGamemode.Server/Events/Voice.cs
View File

@@ -11,13 +11,13 @@ namespace ReallifeGamemode.Server.Events
class Voice : Script
{
[RemoteEvent("CLIENT:AddVoiceListener")]
public void AddPlayerVoiceListenerEvent(Client player, Client target)
public void AddPlayerVoiceListenerEvent(Player player, Player target)
{
player.EnableVoiceTo(target);
}
[RemoteEvent("CLIENT:RemoveVoiceListener")]
public void RemovePlayerVoiceListenerEvent(Client player, Client target)
public void RemovePlayerVoiceListenerEvent(Player player, Player target)
{
player.DisableVoiceTo(target);
}