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

BIN
Import/Bootstrapper.dll
View File

Binary file not shown.

224
Import/Bootstrapper.xml Normal file
View File

@@ -0,0 +1,224 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>Bootstrapper</name>
</assembly>
<members>
<member name="T:GTANetworkAPI.CancelEventArgs">
<summary>
Used to cancel events.
</summary>
</member>
<member name="F:GTANetworkAPI.Event.ResourceStart">
<summary>
Event has no parameters.
</summary>
</member>
<member name="F:GTANetworkAPI.Event.ResourceStop">
<summary>
Event has no parameters.
</summary>
</member>
<member name="F:GTANetworkAPI.Event.ResourceStartEx">
<summary>
Event Params: <see cref="T:System.String"/> resourceName
</summary>
</member>
<member name="F:GTANetworkAPI.Event.ResourceStopEx">
<summary>
Event Params: <see cref="T:System.String"/> resourceName
</summary>
</member>
<member name="F:GTANetworkAPI.Event.MapChange">
<summary>
Event Params: <see cref="T:System.String"/> mapName, <see cref="T:GTANetworkAPI.XmlGroup"/> map
</summary>
</member>
<member name="F:GTANetworkAPI.Event.ChatMessage">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client, <see cref="T:System.String"/> message
</summary>
</member>
<member name="F:GTANetworkAPI.Event.Update">
<summary>
Event has no parameters.
</summary>
</member>
<member name="F:GTANetworkAPI.Event.EntityCreated">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Entity"/> entity
</summary>
</member>
<member name="F:GTANetworkAPI.Event.EntityDeleted">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Entity"/> entity
</summary>
</member>
<member name="F:GTANetworkAPI.Event.EntityModelChange">
<summary>
Event Params: <see cref="T:GTANetworkAPI.NetHandle"/> entity, <see cref="T:System.UInt32"/> oldModel
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerConnected">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client
</summary>
</member>
<member name="F:GTANetworkAPI.Event.IncomingConnection">
<summary>
Event Params: <see cref="T:System.String"/> ip, <see cref="T:System.String"/> serial, <see cref="T:System.String"/> rgscName, <see cref="T:System.UInt64"/> rgscId, <see cref="T:GTANetworkAPI.CancelEventArgs"/> cancel
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerDisconnected">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerSpawn">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerDeath">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client, <see cref="T:GTANetworkAPI.Client"/> killer, <see cref="T:System.UInt32"/> reason
<para>Death reason can be of either <see cref="T:GTANetworkAPI.WeaponHash"/> or <see cref="T:GTANetworkAPI.DeathReason"/></para>
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerDamage">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client, <see cref="T:System.Single"/> healthLoss, <see cref="T:System.Single"/> armorLoss
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerPickup">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client, <see cref="T:GTANetworkAPI.Pickup"/> pickup
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerWeaponSwitch">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client, <see cref="T:GTANetworkAPI.WeaponHash"/> oldWeaponHash, <see cref="T:GTANetworkAPI.WeaponHash"/> newWeaponHash
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerDetonateStickies">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerEnterCheckpoint">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Checkpoint"/> checkpoint, <see cref="T:GTANetworkAPI.Client"/> client
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerExitCheckpoint">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Checkpoint"/> checkpoint, <see cref="T:GTANetworkAPI.Client"/> client
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerEnterColshape">
<summary>
Event Params: <see cref="T:GTANetworkAPI.ColShape"/> colShape, <see cref="T:GTANetworkAPI.Client"/> client
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerExitColshape">
<summary>
Event Params: <see cref="T:GTANetworkAPI.ColShape"/> colShape, <see cref="T:GTANetworkAPI.Client"/> client
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerEnterVehicleAttempt">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client, <see cref="T:GTANetworkAPI.Vehicle"/> vehicle, <see cref="T:System.SByte"/> seatID
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerExitVehicleAttempt">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client, <see cref="T:GTANetworkAPI.Vehicle"/> vehicle
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerEnterVehicle">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client, <see cref="T:GTANetworkAPI.Vehicle"/> vehicle, <see cref="T:System.SByte"/> seatID
</summary>
</member>
<member name="F:GTANetworkAPI.Event.PlayerExitVehicle">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Client"/> client, <see cref="T:GTANetworkAPI.Vehicle"/> vehicle
</summary>
</member>
<member name="F:GTANetworkAPI.Event.VehicleDamage">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Vehicle"/> vehicle, <see cref="T:System.Single"/> bodyHealthLoss, <see cref="T:System.Single"/> engineHealthLoss
</summary>
</member>
<member name="F:GTANetworkAPI.Event.VehicleDeath">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Vehicle"/> vehicle
</summary>
</member>
<member name="F:GTANetworkAPI.Event.VehicleHornToggle">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Vehicle"/> vehicle
</summary>
</member>
<member name="F:GTANetworkAPI.Event.VehicleSirenToggle">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Vehicle"/> vehicle, <see cref="T:System.Boolean"/> oldValue
</summary>
</member>
<member name="F:GTANetworkAPI.Event.VehicleDoorBreak">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Vehicle"/> vehicle, <see cref="T:System.Int32"/> index
</summary>
</member>
<member name="F:GTANetworkAPI.Event.VehicleWindowSmash">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Vehicle"/> vehicle, <see cref="T:System.Int32"/> index
</summary>
</member>
<member name="F:GTANetworkAPI.Event.VehicleTyreBurst">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Vehicle"/> vehicle, <see cref="T:System.Int32"/> index
</summary>
</member>
<member name="F:GTANetworkAPI.Event.VehicleTrailerChange">
<summary>
Event Params: <see cref="T:GTANetworkAPI.Vehicle"/> vehicle, <see cref="T:GTANetworkAPI.Vehicle"/> trailer
</summary>
</member>
<member name="F:GTANetworkAPI.Event.FirstChanceException">
<summary>
<para>Occurs when an exception is thrown in managed code, before the runtime searches
the call stack for an exception handler in the application domain.</para>
<para>Event Params: <see cref="T:System.Exception"/> exception</para>
</summary>
</member>
<member name="F:GTANetworkAPI.Event.UnhandledException">
<summary>
Occurs when an exception is not caught.
Event Params: <see cref="T:System.Exception"/> exception
</summary>
</member>
<member name="F:GTANetworkAPI.Event.Invalid">
<summary>
An invalid event for internal usage
</summary>
</member>
<member name="M:GTANetworkAPI.Entity.op_Equality(GTANetworkAPI.Entity,GTANetworkAPI.Entity)">
public static bool operator ==(Entity left, Entity right) => left?.Value == right?.Value;
public static bool operator !=(Entity left, Entity right) => left?.Value != right?.Value;
</member>
<member name="M:GTANetworkMethods.ClientEvent.TriggerClientEventInRange(GTANetworkAPI.Vector3,System.Single,System.String,System.Object[])">
GTANetworkInternals.RemoteEventResponseHandler.Push((int)player.Value, requestId, callback.Method, callback.Target);
</member>
<member name="M:GTANetworkMethods.IPlayer.SetPlayerEyeColor(GTANetworkAPI.Client,System.Byte)">
void SetPlayerDefaultClothes(Client player);
</member>
<member name="M:GTANetworkMethods.Task.Run(System.Action,System.Int64)">
<summary>
Runs thread-safe API code on main thread.
</summary>
<param name="task"></param>
<param name="delayTime">should be in ms (milliseconds)</param>
</member>
</members>
</doc>

0
Import/bridge.dll → Import/bridge.dll backup
View File

BIN
Import/rage-sharp.dll backup Normal file
View File

Binary file not shown.

7
ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj
View File

@@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType> <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
</PropertyGroup> </PropertyGroup>
@@ -27,6 +28,10 @@
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.5.0" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.5.0" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" /> <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
</ItemGroup> </ItemGroup>

2
ReallifeGamemode.Database/Entities/House.cs
View File

@@ -30,6 +30,6 @@ namespace ReallifeGamemode.Database.Entities
public User Owner { get; set; } public User Owner { get; set; }
[NotMapped] [NotMapped]
public Client User => Owner?.Client; public Player User => Owner?.Player;
} }
} }

4
ReallifeGamemode.Database/Entities/User.cs
View File

@@ -77,7 +77,7 @@ namespace ReallifeGamemode.Database.Entities
set set
{ {
this._wanteds = value; this._wanteds = value;
Client.TriggerEvent("SERVER:SetWanteds", value); Player.TriggerEvent("SERVER:SetWanteds", value);
} }
} }
@@ -111,7 +111,7 @@ namespace ReallifeGamemode.Database.Entities
} }
[NotMapped] [NotMapped]
public Client Client public Player Player
{ {
get => NAPI.Pools.GetAllPlayers().Where(c => c.Name.ToLower() == this.Name.ToLower()).FirstOrDefault(); get => NAPI.Pools.GetAllPlayers().Where(c => c.Name.ToLower() == this.Name.ToLower()).FirstOrDefault();
} }

2
ReallifeGamemode.Database/Entities/UserBankAccount.cs
View File

@@ -35,7 +35,7 @@ namespace ReallifeGamemode.Database.Entities
_balance = value; _balance = value;
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
ClientService.GetClientByNameOrId(dbContext.Users.First(u => u.Id == UserId).Name).TriggerEvent("updateMoney", value); PlayerService.GetPlayerByNameOrId(dbContext.Users.First(u => u.Id == UserId).Name).TriggerEvent("updateMoney", value);
} }
} }
} }

2
ReallifeGamemode.Database/ReallifeGamemode.Database.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>
</PropertyGroup> </PropertyGroup>

8
ReallifeGamemode.Server/Business/BusinessBase.cs
View File

@@ -86,7 +86,7 @@ namespace ReallifeGamemode.Server.Business
} }
} }
private void EntityExitBusinessColShape(ColShape colShape, Client client) private void EntityExitBusinessColShape(ColShape colShape, Player client)
{ {
client.TriggerEvent("SERVER:Business_RemoveHelp", true); client.TriggerEvent("SERVER:Business_RemoveHelp", true);
} }
@@ -106,15 +106,15 @@ namespace ReallifeGamemode.Server.Business
} }
} }
private void EntityEnterBusinessColShape(ColShape colShape, Client client) private void EntityEnterBusinessColShape(ColShape colShape, Player client)
{ {
if (client.IsInVehicle || !client.IsLoggedIn()) return; if (client.IsInVehicle || !client.IsLoggedIn()) return;
client.TriggerEvent("SERVER:Business_ShowMenuHelp"); client.TriggerEvent("SERVER:Business_ShowMenuHelp");
SendBusinessDataToClient(client); SendBusinessDataToPlayer(client);
} }
public void SendBusinessDataToClient(Client player) public void SendBusinessDataToPlayer(Player player)
{ {
User owner = GetOwner(); User owner = GetOwner();

433
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

File diff suppressed because it is too large Load Diff

30
ReallifeGamemode.Server/Commands/FactionCommands.cs
View File

@@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Commands
#region Chat Commands #region Chat Commands
[Command("f", "~m~Benutzung: ~s~/f [Nachricht]", GreedyArg = true)] [Command("f", "~m~Benutzung: ~s~/f [Nachricht]", GreedyArg = true)]
public void CmdFactionF(Client player, string message) public void CmdFactionF(Player player, string message)
{ {
Faction f = player.GetUser()?.Faction; Faction f = player.GetUser()?.Faction;
if (f == null || f.StateOwned) if (f == null || f.StateOwned)
@@ -40,7 +40,7 @@ namespace ReallifeGamemode.Server.Commands
} }
[Command("r", "~m~Benutzung: ~s~/r [Nachricht]", GreedyArg = true)] [Command("r", "~m~Benutzung: ~s~/r [Nachricht]", GreedyArg = true)]
public void CmdFactionR(Client player, string message) public void CmdFactionR(Player player, string message)
{ {
Faction f = player.GetUser()?.Faction; Faction f = player.GetUser()?.Faction;
if (f == null || !f.StateOwned) if (f == null || !f.StateOwned)
@@ -56,7 +56,7 @@ namespace ReallifeGamemode.Server.Commands
} }
[Command("d", "~m~Benutzung: ~s~/d [Nachricht]", GreedyArg = true)] [Command("d", "~m~Benutzung: ~s~/d [Nachricht]", GreedyArg = true)]
public void CmdFactionD(Client player, string message) public void CmdFactionD(Player player, string message)
{ {
Faction f = player.GetUser()?.Faction; Faction f = player.GetUser()?.Faction;
if (f == null || !f.StateOwned) if (f == null || !f.StateOwned)
@@ -76,7 +76,7 @@ namespace ReallifeGamemode.Server.Commands
#endregion #endregion
#region Leader Commands #region Leader Commands
[Command("giverank", "~m~Benutzung: ~s~/giverank [Name] [Rang]", GreedyArg = true)] [Command("giverank", "~m~Benutzung: ~s~/giverank [Name] [Rang]", GreedyArg = true)]
public void CmdFactionGiverank(Client player, string name, string rank) public void CmdFactionGiverank(Player player, string name, string rank)
{ {
if (player.GetUser()?.FactionId == null || player.GetUser().FactionLeader == false) if (player.GetUser()?.FactionId == null || player.GetUser().FactionLeader == false)
{ {
@@ -84,7 +84,7 @@ namespace ReallifeGamemode.Server.Commands
return; return;
} }
Client target = ClientService.GetClientByNameOrId(name); Player target = PlayerService.GetPlayerByNameOrId(name);
if (target == null || !target.IsLoggedIn()) if (target == null || !target.IsLoggedIn())
{ {
ChatService.PlayerNotFound(player); ChatService.PlayerNotFound(player);
@@ -116,7 +116,7 @@ namespace ReallifeGamemode.Server.Commands
} }
[Command("lc", "~m~Benutzung: ~s~/lc [Nachricht]", GreedyArg = true)] [Command("lc", "~m~Benutzung: ~s~/lc [Nachricht]", GreedyArg = true)]
public void CmdFactionLc(Client player, string message) public void CmdFactionLc(Player player, string message)
{ {
if (player.GetUser()?.FactionId == null || player.GetUser().FactionLeader == false) if (player.GetUser()?.FactionId == null || player.GetUser().FactionLeader == false)
{ {
@@ -135,7 +135,7 @@ namespace ReallifeGamemode.Server.Commands
} }
[Command("setweaponrank", "~m~Benutzung: ~s~/setweaponrank [Waffen Name] [Rank]")] [Command("setweaponrank", "~m~Benutzung: ~s~/setweaponrank [Waffen Name] [Rank]")]
public void CmdFactionWeaponRank(Client player, string weaponModel, int rank) public void CmdFactionWeaponRank(Player player, string weaponModel, int rank)
{ {
if (player.GetUser()?.FactionId == null || player.GetUser().FactionLeader == false) if (player.GetUser()?.FactionId == null || player.GetUser().FactionLeader == false)
{ {
@@ -177,7 +177,7 @@ namespace ReallifeGamemode.Server.Commands
#region Sanitäter Commands #region Sanitäter Commands
[Command("revive", "~m~Benutzung: ~s~/revive")] [Command("revive", "~m~Benutzung: ~s~/revive")]
public void CmdFactionMedicRevive(Client player) public void CmdFactionMedicRevive(Player player)
{ {
if (player.GetUser()?.FactionId == null || player.GetUser().FactionId != 2) if (player.GetUser()?.FactionId == null || player.GetUser().FactionId != 2)
{ {
@@ -191,7 +191,7 @@ namespace ReallifeGamemode.Server.Commands
} }
var nearPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player); var nearPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player);
var deadPlayer = nearPlayers.Where(i => i.GetData("isDead") == true).FirstOrDefault(); var deadPlayer = nearPlayers.Where(i => i.GetData<bool>("isDead") == true).FirstOrDefault();
if (player == deadPlayer) if (player == deadPlayer)
{ {
ChatService.ErrorMessage(player, "Du kannst dich nicht selbst wiederbeleben"); ChatService.ErrorMessage(player, "Du kannst dich nicht selbst wiederbeleben");
@@ -210,7 +210,7 @@ namespace ReallifeGamemode.Server.Commands
} }
[Command("heal", "~m~Benutzung: ~s~/heal [Spieler]")] //TODO Eventuell noch mit Geldbetrag wie bei SA:MP [Command("heal", "~m~Benutzung: ~s~/heal [Spieler]")] //TODO Eventuell noch mit Geldbetrag wie bei SA:MP
public void CmdFactionMedicHealive(Client player, string receiver) public void CmdFactionMedicHealive(Player player, string receiver)
{ {
if (player.GetUser()?.FactionId == null || player.GetUser().FactionId != 2) if (player.GetUser()?.FactionId == null || player.GetUser().FactionId != 2)
{ {
@@ -222,7 +222,7 @@ namespace ReallifeGamemode.Server.Commands
ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht heilen"); ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht heilen");
return; return;
} }
Client target = ClientService.GetClientByNameOrId(receiver); Player target = PlayerService.GetPlayerByNameOrId(receiver);
target.Health = 100; target.Health = 100;
target.SendNotification("Du wurdest von ~g~" + player.Name + " ~s~geheilt.", false); target.SendNotification("Du wurdest von ~g~" + player.Name + " ~s~geheilt.", false);
player.SendNotification("Du hast ~g~" + target.Name + " ~s~geheilt.", false); player.SendNotification("Du hast ~g~" + target.Name + " ~s~geheilt.", false);
@@ -230,7 +230,7 @@ namespace ReallifeGamemode.Server.Commands
#endregion #endregion
#region Staatsfraktionen (LSPD / FBI) Commands #region Staatsfraktionen (LSPD / FBI) Commands
[Command("wanted", "~m~Benutzung: ~s~/wa(nted) [Name / ID] [Anzahl] [Grund]", Alias = "wa", GreedyArg = true)] [Command("wanted", "~m~Benutzung: ~s~/wa(nted) [Name / ID] [Anzahl] [Grund]", Alias = "wa", GreedyArg = true)]
public void CmdFactionWanted(Client player, string nameOrId, int amount, string reason) public void CmdFactionWanted(Player player, string nameOrId, int amount, string reason)
{ {
User user = player.GetUser(); User user = player.GetUser();
if (user == null || (user.FactionId != 1 && user.FactionId != 3)) if (user == null || (user.FactionId != 1 && user.FactionId != 3))
@@ -245,7 +245,7 @@ namespace ReallifeGamemode.Server.Commands
return; return;
} }
Client target = ClientService.GetClientByNameOrId(nameOrId); Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
if (target == null || !target.IsLoggedIn()) if (target == null || !target.IsLoggedIn())
{ {
ChatService.PlayerNotFound(player); ChatService.PlayerNotFound(player);
@@ -263,7 +263,7 @@ namespace ReallifeGamemode.Server.Commands
} }
[Command("clear", "~m~Benutzung: ~s~/clear [Name / ID] [Grund]", GreedyArg = true)] [Command("clear", "~m~Benutzung: ~s~/clear [Name / ID] [Grund]", GreedyArg = true)]
public void CmdFactionClear(Client player, string nameOrId, string reason) public void CmdFactionClear(Player player, string nameOrId, string reason)
{ {
User user = player.GetUser(); User user = player.GetUser();
@@ -273,7 +273,7 @@ namespace ReallifeGamemode.Server.Commands
return; return;
} }
Client target = ClientService.GetClientByNameOrId(nameOrId); Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
if (target == null || !target.IsLoggedIn()) if (target == null || !target.IsLoggedIn())
{ {
ChatService.PlayerNotFound(player); ChatService.PlayerNotFound(player);

2
ReallifeGamemode.Server/Commands/GroupCommands.cs
View File

@@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Commands
{ {
#region Chat Commands #region Chat Commands
[Command("gc", "~m~Benutzung: ~s~/gc [Nachricht]", GreedyArg = true)] [Command("gc", "~m~Benutzung: ~s~/gc [Nachricht]", GreedyArg = true)]
public void CmdGroupG(Client player, string message) public void CmdGroupG(Player player, string message)
{ {
Database.Entities.Group group = player.GetUser().Group; Database.Entities.Group group = player.GetUser().Group;
if (group == null) if (group == null)

12
ReallifeGamemode.Server/Commands/UserCommands.cs
View File

@@ -13,7 +13,7 @@ namespace ReallifeGamemode.Server.Commands
class UserCommands : Script class UserCommands : Script
{ {
[Command("dice", "~m~Benutzung: ~s~/dice")] [Command("dice", "~m~Benutzung: ~s~/dice")]
public void CmdUserDice(Client player) public void CmdUserDice(Player player)
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
@@ -22,15 +22,15 @@ namespace ReallifeGamemode.Server.Commands
var peopleInRange = NAPI.Player.GetPlayersInRadiusOfPlayer(7, player); var peopleInRange = NAPI.Player.GetPlayersInRadiusOfPlayer(7, player);
foreach (var managedClient in peopleInRange) foreach (var managedPlayer in peopleInRange)
{ {
if (!managedClient.IsLoggedIn()) return; if (!managedPlayer.IsLoggedIn()) return;
ChatService.SendMessage(managedClient, "* " + player.Name + " hat eine " + number + " gewürfelt."); ChatService.SendMessage(managedPlayer, "* " + player.Name + " hat eine " + number + " gewürfelt.");
} }
} }
[Command("car", "~m~Benutzung: ~s~/car")] [Command("car", "~m~Benutzung: ~s~/car")]
public void CmdUserCar(Client player) public void CmdUserCar(Player player)
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
if (!player.IsInVehicle) return; if (!player.IsInVehicle) return;
@@ -49,7 +49,7 @@ namespace ReallifeGamemode.Server.Commands
} }
[Command("paycheck", "~m~Benutzung: ~s~/paycheck")] [Command("paycheck", "~m~Benutzung: ~s~/paycheck")]
public void CmdUserPaycheck(Client client) public void CmdUserPaycheck(Player client)
{ {
User user = client.GetUser(); User user = client.GetUser();

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); 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; if (client.IsInVehicle || !client.IsLoggedIn()) return;
client.TriggerEvent("drivingSchoolMenu"); client.TriggerEvent("drivingSchoolMenu");
} }
private static void EntityExitBusinessColShape(ColShape colShape, Client client) private static void EntityExitBusinessColShape(ColShape colShape, Player client)
{ {
client.TriggerEvent("removeDrivingSchoolMenu"); client.TriggerEvent("removeDrivingSchoolMenu");
} }
[RemoteEvent("startDrivingSchool")] [RemoteEvent("startDrivingSchool")]
public void StartDrivingSchool(Client client) public void StartDrivingSchool(Player client)
{ {
User user = client.GetUser(); User user = client.GetUser();
if (user.DriverLicenseVehicle || client.HasData("ActiveSchool")) if (user.DriverLicenseVehicle || client.HasData("ActiveSchool"))
@@ -136,7 +136,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
} }
[RemoteEvent("timerCheckVehicle")] [RemoteEvent("timerCheckVehicle")]
public void TimerCheckVehicle(Client user) public void TimerCheckVehicle(Player user)
{ {
Vehicle veh = user.Vehicle; Vehicle veh = user.Vehicle;
@@ -158,7 +158,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
} }
[RemoteEvent("drivingSchoolEventEnd")] [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.TriggerEvent("renderTextOnScreen", "Du hast den Führerschein bestanden. Glückwunsch!");
user.ResetData("ActiveSchool"); user.ResetData("ActiveSchool");
@@ -183,7 +183,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
[RemoteEvent("drivingSchoolEvent")] [RemoteEvent("drivingSchoolEvent")]
public void DrivingSchoolEvent(Client user, int checkpoint) public void DrivingSchoolEvent(Player user, int checkpoint)
{ {
if (checkpoint == 0) if (checkpoint == 0)
{ {
@@ -208,7 +208,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
[RemoteEvent("startBikeSchool")] [RemoteEvent("startBikeSchool")]
public void StartBikeSchool(Client client) public void StartBikeSchool(Player client)
{ {
User user = client.GetUser(); User user = client.GetUser();
if (user.DriverLicenseBike || client.HasData("ActiveSchool")) if (user.DriverLicenseBike || client.HasData("ActiveSchool"))
@@ -235,7 +235,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
[RemoteEvent("bikeSchoolEventEnd")] [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.TriggerEvent("renderTextOnScreen", "Du hast den Führerschein bestanden. Glückwunsch!");
user.ResetData("ActiveSchool"); user.ResetData("ActiveSchool");
@@ -260,7 +260,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
[RemoteEvent("bikeSchoolEvent")] [RemoteEvent("bikeSchoolEvent")]
public void bikeSchoolEvent(Client user, int checkpoint) public void bikeSchoolEvent(Player user, int checkpoint)
{ {
if (checkpoint == 0) if (checkpoint == 0)
{ {

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

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

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

@@ -7,7 +7,7 @@ namespace ReallifeGamemode.Server.Events
public class Chat : Script public class Chat : Script
{ {
[ServerEvent(Event.ChatMessage)] [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]~)|(!{(.*)})", ""); string serverMsg = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
if (serverMsg.Trim().Length == 0) return; 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 class Connect : Script
{ {
[ServerEvent(Event.PlayerConnected)] [ServerEvent(Event.PlayerConnected)]
public void OnPlayerConnected(Client player) public void OnPlayerConnected(Player player)
{ {
player.SetData("isLoggedIn", false); player.SetData("isLoggedIn", false);
player.Position = new Vector3(-1883.736, -781.4911, -10); player.Position = new Vector3(-1883.736, -781.4911, -10);
player.FreezePosition = true;
using (var dbContext = new DatabaseContext()) 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()) 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 public class Death : Script
{ {
[ServerEvent(Event.PlayerDeath)] [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(); if (!player.IsLoggedIn()) player.Kick();
player.SetData("isDead", true); player.SetData("isDead", true);
@@ -121,7 +121,7 @@ namespace ReallifeGamemode.Server.Events
[RemoteEvent("RespawnPlayerAtHospital")] [RemoteEvent("RespawnPlayerAtHospital")]
public void RespawnPlayerAtHospital(Client player) public void RespawnPlayerAtHospital(Player player)
{ {
player.SetData("isDead", false); player.SetData("isDead", false);
player.RemoveAllWeapons(); player.RemoveAllWeapons();

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

@@ -22,7 +22,7 @@ namespace ReallifeGamemode.Server.Events
public class Disconnect : Script public class Disconnect : Script
{ {
[ServerEvent(Event.PlayerDisconnected)] [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; if (!player.IsLoggedIn()) return;
@@ -61,7 +61,7 @@ namespace ReallifeGamemode.Server.Events
user.PositionY = pos.Y; user.PositionY = pos.Y;
user.PositionZ = pos.Z; user.PositionZ = pos.Z;
saveUser.SaveChanges(); 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); player.SetData("isLoggedIn", false);
} }

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

@@ -12,16 +12,16 @@ namespace ReallifeGamemode.Server.Events
public class EnterVehicle : Script public class EnterVehicle : Script
{ {
[ServerEvent(Event.PlayerEnterVehicle)] [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) if (seat != -1)
return; return;
if (vehicle.GetServerVehicle() is FactionVehicle veh) 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); Vector3 vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value);
if (vector == null) if (vector == new Vector3())
return; return;
List<Vector3> dealPoint = new List<Vector3>(); List<Vector3> dealPoint = new List<Vector3>();
dealPoint.Add(vector); dealPoint.Add(vector);

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

@@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Events
public class EnterVehicleAttempt : Script public class EnterVehicleAttempt : Script
{ {
[ServerEvent(Event.PlayerEnterVehicleAttempt)] [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) if ((VehicleHash)vehicle.Model == VehicleHash.Dune3)
{ {
@@ -44,7 +44,7 @@ namespace ReallifeGamemode.Server.Events
player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true); player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true);
return; return;
} }
if (sVeh.SchoolId != player.GetData("ActiveSchool")) if (sVeh.SchoolId != player.GetData<int>("ActiveSchool"))
{ {
player.StopAnimation(); player.StopAnimation();
player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true); 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 public class ExitVehicle : Script
{ {
[ServerEvent(Event.PlayerExitVehicleAttempt)] [ServerEvent(Event.PlayerExitVehicleAttempt)]
public void OnPlayerExitVehicle(Client client, GTANetworkAPI.Vehicle vehicle) public void OnPlayerExitVehicle(Player client, GTANetworkAPI.Vehicle vehicle)
{ {
if (client.VehicleSeat != -1) if (client.VehicleSeat != -1)
return; return;
if (vehicle.GetServerVehicle() is FactionVehicle veh) 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); CheckPointHandle.RemovePlayerHandlerFromList(client);
client.TriggerEvent("destroyCP"); client.TriggerEvent("destroyCP");

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

@@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Events
class Faction : Script class Faction : Script
{ {
[RemoteEvent("OnFactionRanksEdit")] [RemoteEvent("OnFactionRanksEdit")]
public void OnFactionRanksEdit(Client player, string jsonData) public void OnFactionRanksEdit(Player player, string jsonData)
{ {
FactionRankHelper helper = JsonConvert.DeserializeObject<FactionRankHelper>(jsonData); FactionRankHelper helper = JsonConvert.DeserializeObject<FactionRankHelper>(jsonData);
using (var context = new DatabaseContext()) 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 public class Inventory : Script
{ {
[RemoteEvent("getNearVehicles")] [RemoteEvent("getNearVehicles")]
public void SrvEvent_GetNearVehicles(Client client) public void SrvEvent_GetNearVehicles(Player client)
{ {
var user = client.GetUser(); var user = client.GetUser();
if (!client.IsInVehicle) if (!client.IsInVehicle)

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

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

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

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

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

@@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Events
class Register : Script class Register : Script
{ {
[RemoteEvent("CLIENT:Login_RegisterRequest")] [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()) 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(); var users = NAPI.Pools.GetAllPlayers();
foreach (Client user in users) foreach (Player user in users)
{ {
using (var saveUsers = new DatabaseContext()) 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>(); private readonly Dictionary<NetHandle, bool> _sirenStates = new Dictionary<NetHandle, bool>();
[RemoteEvent("keyPress:B:toggleSiren")] [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; GTANetworkAPI.Vehicle pV = player.Vehicle;
bool oldValue = _sirenStates.ContainsKey(pV.Handle) ? _sirenStates[pV.Handle] : false; bool oldValue = _sirenStates.ContainsKey(pV.Handle) ? _sirenStates[pV.Handle] : false;
bool newValue = !oldValue; bool newValue = !oldValue;

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

@@ -11,7 +11,7 @@ namespace ReallifeGamemode.Server.Events
public class UpdateCharacterCloth : Script public class UpdateCharacterCloth : Script
{ {
[RemoteEvent("updateDutyProp")] [RemoteEvent("updateDutyProp")]
public void UpdateDutyProp(Client player, int componentId, int componentVariation) public void UpdateDutyProp(Player player, int componentId, int componentVariation)
{ {
if (componentId != -1) if (componentId != -1)
{ {
@@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("updateDutyCloth")] [RemoteEvent("updateDutyCloth")]
public void UpdateDutyCloth(Client player, int componentId, int componentVariation) public void UpdateDutyCloth(Player player, int componentId, int componentVariation)
{ {
if (componentId == 11) if (componentId == 11)
{ {
@@ -51,7 +51,7 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("saveCharacterCloth")] [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()) using (var context = new DatabaseContext())
{ {
@@ -126,7 +126,7 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("defaultCharacterCloth")] [RemoteEvent("defaultCharacterCloth")]
public static void LoadCharacterDefaults(Client player) public static void LoadCharacterDefaults(Player player)
{ {
User user = player.GetUser(); User user = player.GetUser();
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
@@ -153,7 +153,7 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("SERVER:BuyCharacterClothes")] [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 * [0] ComponentID

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

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

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

@@ -10,7 +10,7 @@ namespace ReallifeGamemode.Server.Events
public class UpdateCharacterWeapon : Script public class UpdateCharacterWeapon : Script
{ {
[RemoteEvent("updateWeaponSelection")] [RemoteEvent("updateWeaponSelection")]
public void UpdateWeaponSelection(Client client, string weaponModel, int slot) public void UpdateWeaponSelection(Player client, string weaponModel, int slot)
{ {
if (weaponModel == "Keine") if (weaponModel == "Keine")
{ {
@@ -43,14 +43,14 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("cancelWeaponSelection")] [RemoteEvent("cancelWeaponSelection")]
public void CancelWeaponSelection(Client client) public void CancelWeaponSelection(Player client)
{ {
client.RemoveAllWeapons(); client.RemoveAllWeapons();
} }
[RemoteEvent("saveWeaponSelection")] [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(); client.RemoveAllWeapons();
if (!uint.TryParse(primaryModel, out uint primary)) 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 public class Vehicle : Script
{ {
[RemoteEvent("VehicleMenu_ToggleEngine")] [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; GTANetworkAPI.Vehicle v = player.Vehicle;
@@ -72,9 +72,9 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("VehicleMenu_LockCar")] [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; GTANetworkAPI.Vehicle v = player.Vehicle;
@@ -182,9 +182,9 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("CLIENT:VehicleMenu_ParkCar")] [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; GTANetworkAPI.Vehicle v = player.Vehicle;
@@ -247,7 +247,7 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("VehicleMenu_ToggleSingleDoor")] [RemoteEvent("VehicleMenu_ToggleSingleDoor")]
public void VehicleMenuToggleSingleDoorEvent(Client player, int door) public void VehicleMenuToggleSingleDoorEvent(Player player, int door)
{ {
if (!player.IsInVehicle) return; if (!player.IsInVehicle) return;
GTANetworkAPI.Vehicle veh = player.Vehicle; GTANetworkAPI.Vehicle veh = player.Vehicle;
@@ -260,7 +260,7 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("VehicleMenu_OpenAllDoors")] [RemoteEvent("VehicleMenu_OpenAllDoors")]
public void VehicleMenuOpenAllDoorsEvent(Client player) public void VehicleMenuOpenAllDoorsEvent(Player player)
{ {
if (!player.IsInVehicle) return; if (!player.IsInVehicle) return;
GTANetworkAPI.Vehicle veh = player.Vehicle; GTANetworkAPI.Vehicle veh = player.Vehicle;
@@ -272,7 +272,7 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("VehicleMenu_CloseAllDoors")] [RemoteEvent("VehicleMenu_CloseAllDoors")]
public void VehicleMenuCloseAllDoorsEvent(Client player) public void VehicleMenuCloseAllDoorsEvent(Player player)
{ {
if (!player.IsInVehicle) return; if (!player.IsInVehicle) return;
GTANetworkAPI.Vehicle veh = player.Vehicle; GTANetworkAPI.Vehicle veh = player.Vehicle;

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

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

42
ReallifeGamemode.Server/Extensions/ClientExtension.cs
View File

@@ -9,23 +9,23 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
/** /**
* @overview Life of German Reallife - Client Extension (ClientExtension.cs) * @overview Life of German Reallife - Player Extension (PlayerExtension.cs)
* @author hydrant, Siga, aviate * @author hydrant, Siga, aviate
* @copyright (c) 2008 - 2018 Life of German * @copyright (c) 2008 - 2018 Life of German
*/ */
namespace ReallifeGamemode.Server.Extensions namespace ReallifeGamemode.Server.Extensions
{ {
public static class ClientExtension public static class PlayerExtension
{ {
/// <summary> /// <summary>
/// Gibt das User-Objekt eines Client's zurück. /// Gibt das User-Objekt eines Player's zurück.
/// Gibt nichts zurück, wenn der Client nicht eingeloggt ist /// Gibt nichts zurück, wenn der Player nicht eingeloggt ist
/// </summary> /// </summary>
/// <param name="client">Der Client, dessen User man bekommen möchte</param> /// <param name="client">Der Player, dessen User man bekommen möchte</param>
/// <param name="context">Ein eventuell vorhandener Datenbank-Context, falls man Änderungen in der Datenbank vornehmen will</param> /// <param name="context">Ein eventuell vorhandener Datenbank-Context, falls man Änderungen in der Datenbank vornehmen will</param>
/// <returns></returns> /// <returns></returns>
public static User GetUser(this Client client, DatabaseContext context = null) public static User GetUser(this Player client, DatabaseContext context = null)
{ {
context = context ?? new DatabaseContext(); context = context ?? new DatabaseContext();
if (!client.IsLoggedIn()) return null; if (!client.IsLoggedIn()) return null;
@@ -55,16 +55,16 @@ namespace ReallifeGamemode.Server.Extensions
} }
/// <summary> /// <summary>
/// Gibt zurück, ob ein Client eingeloggt ist /// Gibt zurück, ob ein Player eingeloggt ist
/// </summary> /// </summary>
/// <param name="player">Der Client, dessen Login-Status man bekommen möchte</param> /// <param name="player">Der Player, dessen Login-Status man bekommen möchte</param>
/// <returns></returns> /// <returns></returns>
public static bool IsLoggedIn(this Client player) public static bool IsLoggedIn(this Player player)
{ {
return player.HasData("isLoggedIn") ? player.GetData("isLoggedIn") : false; return player.HasData("isLoggedIn") ? player.GetData<bool>("isLoggedIn") : false;
} }
public static Vector3 GetPositionFromPlayer(Client player, float distance, int offset = 0) public static Vector3 GetPositionFromPlayer(Player player, float distance, int offset = 0)
{ {
var pos = player.Position; var pos = player.Position;
var a = player.Heading + offset; var a = player.Heading + offset;
@@ -78,8 +78,8 @@ namespace ReallifeGamemode.Server.Extensions
internal static T GetData<T>(this User user, string key, T nullValue) internal static T GetData<T>(this User user, string key, T nullValue)
{ {
key += "data_"; key += "data_";
if (!user.Client.HasData(key)) return nullValue; if (!user.Player.HasData(key)) return nullValue;
return JsonConvert.DeserializeObject<T>(user.Client.GetData(key)); return JsonConvert.DeserializeObject<T>(user.Player.GetData<dynamic>(key));
} }
internal static T GetData<T>(this User user, string key) => user.GetData<T>(key, default); internal static T GetData<T>(this User user, string key) => user.GetData<T>(key, default);
@@ -87,10 +87,10 @@ namespace ReallifeGamemode.Server.Extensions
internal static void SetData(this User user, string key, object value) internal static void SetData(this User user, string key, object value)
{ {
key += "data_"; key += "data_";
user.Client.SetData(key, JsonConvert.SerializeObject(value)); user.Player.SetData(key, JsonConvert.SerializeObject(value));
} }
internal static void GiveWanteds(this User user, Client cop, int amount, string reason) internal static void GiveWanteds(this User user, Player cop, int amount, string reason)
{ {
if (user.Wanteds + amount > 50) if (user.Wanteds + amount > 50)
{ {
@@ -104,9 +104,9 @@ namespace ReallifeGamemode.Server.Extensions
dbUser.Wanteds = newWanteds; dbUser.Wanteds = newWanteds;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
user.Client.SetSharedData("blipColor", 64); user.Player.SetSharedData("blipColor", 64);
ChatService.SendMessage(user.Client, "!{#FF614A}Du hast ein Verbrechen begangen: " + reason + "" + (cop != null ? " | Gemeldet von: " + cop.Name + "." : "")); ChatService.SendMessage(user.Player, "!{#FF614A}Du hast ein Verbrechen begangen: " + reason + "" + (cop != null ? " | Gemeldet von: " + cop.Name + "." : ""));
ChatService.SendMessage(user.Client, " !{#FFFF00}Fahnundgslevel:~s~ " + newWanteds); ChatService.SendMessage(user.Player, " !{#FFFF00}Fahnundgslevel:~s~ " + newWanteds);
foreach (var copPlayer in NAPI.Pools.GetAllPlayers()) foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
{ {
@@ -146,7 +146,7 @@ namespace ReallifeGamemode.Server.Extensions
} }
} }
public static void BanPlayer(this User user, Client admin, string reason, int mins) public static void BanPlayer(this User user, Player admin, string reason, int mins)
{ {
using (var banUserContext = new DatabaseContext()) using (var banUserContext = new DatabaseContext())
{ {
@@ -158,7 +158,7 @@ namespace ReallifeGamemode.Server.Extensions
ChatService.Broadcast("!{#FF4040}[BAN] " + user.Name + " wurde von " + admin.Name + " permanent gebannt. [" + reason + "]"); ChatService.Broadcast("!{#FF4040}[BAN] " + user.Name + " wurde von " + admin.Name + " permanent gebannt. [" + reason + "]");
banUser = new Ban { UserId = user.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp }; banUser = new Ban { UserId = user.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp };
user.Client?.Kick(); user.Player?.Kick();
mins--; mins--;
} }
@@ -166,7 +166,7 @@ namespace ReallifeGamemode.Server.Extensions
{ {
ChatService.Broadcast("!{#FF4040}[BAN] " + user.Name + " wurde von " + admin.Name + " für " + mins + " Minuten gebannt. [" + reason + "]"); ChatService.Broadcast("!{#FF4040}[BAN] " + user.Name + " wurde von " + admin.Name + " für " + mins + " Minuten gebannt. [" + reason + "]");
banUser = new Ban { UserId = user.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp + mins * 60 }; banUser = new Ban { UserId = user.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp + mins * 60 };
user.Client?.Kick(); user.Player?.Kick();
} }
banUserContext.Bans.Add(banUser); banUserContext.Bans.Add(banUser);

2
ReallifeGamemode.Server/Extensions/ListExtensions.cs
View File

@@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Extensions
{ {
static class ListExtensions static class ListExtensions
{ {
public static bool Contains(this List<Client> list, Client client) public static bool Contains(this List<Player> list, Player client)
{ {
return list.Any(l => l.Handle.Value == client.Handle.Value); return list.Any(l => l.Handle.Value == client.Handle.Value);
} }

2
ReallifeGamemode.Server/Extensions/VehicleExtension.cs
View File

@@ -13,7 +13,7 @@ namespace ReallifeGamemode.Server.Extensions
return VehicleManager.GetServerVehicleFromVehicle(veh, context); return VehicleManager.GetServerVehicleFromVehicle(veh, context);
} }
public static Client GetDriver(this Vehicle veh) public static Player GetDriver(this Vehicle veh)
{ {
return NAPI.Pools.GetAllPlayers().Where(p => p.Vehicle.Handle == veh.Handle && p.VehicleSeat == -1).FirstOrDefault(); return NAPI.Pools.GetAllPlayers().Where(p => p.Vehicle.Handle == veh.Handle && p.VehicleSeat == -1).FirstOrDefault();
} }

4
ReallifeGamemode.Server/Factions/Medic/Medic.cs
View File

@@ -62,7 +62,7 @@ namespace ReallifeGamemode.Server.Factions.Medic
} }
} }
[RemoteEvent("loadMedicTasks")] [RemoteEvent("loadMedicTasks")]
public void LoadMedicTasks(Client player, int type) public void LoadMedicTasks(Player player, int type)
{ {
switch (type) switch (type)
{ {
@@ -78,7 +78,7 @@ namespace ReallifeGamemode.Server.Factions.Medic
} }
} }
[RemoteEvent("updateMedicTask")] [RemoteEvent("updateMedicTask")]
public void UpdateMedicTasks(Client player, int type, int index, string medicName) public void UpdateMedicTasks(Player player, int type, int index, string medicName)
{ {
switch (type) switch (type)
{ {

12
ReallifeGamemode.Server/Finance/Economy.cs
View File

@@ -22,7 +22,7 @@ namespace ReallifeGamemode.Server.Finance
{ {
public static Dictionary<int, Paycheck> Paychecks { get; set; } = new Dictionary<int, Paycheck>(); public static Dictionary<int, Paycheck> Paychecks { get; set; } = new Dictionary<int, Paycheck>();
public static (int, float, float) GetEconomyClass(Client client, int wage) public static (int, float, float) GetEconomyClass(Player client, int wage)
{ {
int bankAccount = client.GetUser().GetBankAccount().Balance; int bankAccount = client.GetUser().GetBankAccount().Balance;
float financialHelp = -(float)Math.Pow(1.0005, -bankAccount) * -1000; float financialHelp = -(float)Math.Pow(1.0005, -bankAccount) * -1000;
@@ -33,7 +33,7 @@ namespace ReallifeGamemode.Server.Finance
return (bankAccount, financialHelp, financialInterest); return (bankAccount, financialHelp, financialInterest);
} }
public static int GetVehicleTaxation(Client client) public static int GetVehicleTaxation(Player client)
{ {
int vehicleTaxation = 0; int vehicleTaxation = 0;
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
@@ -141,7 +141,7 @@ namespace ReallifeGamemode.Server.Finance
return vehicleTaxation; return vehicleTaxation;
} }
public static float GetPropertyTaxation(Client client) public static float GetPropertyTaxation(Player client)
{ {
float propertyTaxation = 0; float propertyTaxation = 0;
User user = client.GetUser(); User user = client.GetUser();
@@ -154,7 +154,7 @@ namespace ReallifeGamemode.Server.Finance
} }
public static void SetPaycheck(Client client, int wage) public static void SetPaycheck(Player client, int wage)
{ {
(int bankAccount, float financialHelp, float financialInterest) = GetEconomyClass(client, wage); (int bankAccount, float financialHelp, float financialInterest) = GetEconomyClass(client, wage);
float propertyTax = GetPropertyTaxation(client); float propertyTax = GetPropertyTaxation(client);
@@ -169,7 +169,7 @@ namespace ReallifeGamemode.Server.Finance
ReleasePayDay(client, paycheck); ReleasePayDay(client, paycheck);
} }
private static int GetRentalFees(Client client) private static int GetRentalFees(Player client)
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
@@ -178,7 +178,7 @@ namespace ReallifeGamemode.Server.Finance
} }
} }
public static void ReleasePayDay(Client client, Paycheck paycheck) public static void ReleasePayDay(Player client, Paycheck paycheck)
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {

26
ReallifeGamemode.Server/Gangwar/Gangwar.cs
View File

@@ -32,12 +32,12 @@ namespace ReallifeGamemode.Server.Gangwar
} }
} }
public static void loadClient(Client client) public static void loadPlayer(Player client)
{ {
client.TriggerEvent("GangAreas:Create", JsonConvert.SerializeObject(turfs.ToArray())); client.TriggerEvent("GangAreas:Create", JsonConvert.SerializeObject(turfs.ToArray()));
} }
public static void loadTurfs_ToAllClients() public static void loadTurfs_ToAllPlayers()
{ {
NAPI.ClientEvent.TriggerClientEventForAll("GangAreas:Create", JsonConvert.SerializeObject(turfs.ToArray())); NAPI.ClientEvent.TriggerClientEventForAll("GangAreas:Create", JsonConvert.SerializeObject(turfs.ToArray()));
foreach(var l in NAPI.Pools.GetAllPlayers()) foreach(var l in NAPI.Pools.GetAllPlayers())
@@ -50,13 +50,13 @@ namespace ReallifeGamemode.Server.Gangwar
} }
} }
public static void GangwarKill(Client killer, Client victim) public static void GangwarKill(Player killer, Player victim)
{ {
if (killer.HasData("GotInsideOfTurf") && victim.HasData("GotInsideOfTurf")) if (killer.HasData("GotInsideOfTurf") && victim.HasData("GotInsideOfTurf"))
{ {
foreach (var turf in getTurfs()) foreach (var turf in getTurfs())
{ {
if (turf.getId() == victim.GetData("inGangWar")) if (turf.getId() == victim.GetData<int>("inGangWar"))
{ {
turf.setKill(victim.GetUser().Faction.Name); turf.setKill(victim.GetUser().Faction.Name);
return; return;
@@ -71,7 +71,7 @@ namespace ReallifeGamemode.Server.Gangwar
} }
[RemoteEvent("Gangarea:Enter")] [RemoteEvent("Gangarea:Enter")]
public void RmtEvent_TurfEnter(Client client, string jsonId) public void RmtEvent_TurfEnter(Player client, string jsonId)
{ {
int id = JsonConvert.DeserializeObject<int>(jsonId); int id = JsonConvert.DeserializeObject<int>(jsonId);
@@ -86,7 +86,7 @@ namespace ReallifeGamemode.Server.Gangwar
} }
[RemoteEvent("Gangarea:Leave")] [RemoteEvent("Gangarea:Leave")]
public void RmtEvent_TurfLeave(Client client, string jsonId) public void RmtEvent_TurfLeave(Player client, string jsonId)
{ {
int id = JsonConvert.DeserializeObject<int>(jsonId); int id = JsonConvert.DeserializeObject<int>(jsonId);
@@ -101,7 +101,7 @@ namespace ReallifeGamemode.Server.Gangwar
} }
[RemoteEvent("SERVER:SetTurf")] [RemoteEvent("SERVER:SetTurf")]
public void RmtEvent_SetTurf(Client client, string jsonX, string jsonY, string jsonRot, string jsonRange, string Name) public void RmtEvent_SetTurf(Player client, string jsonX, string jsonY, string jsonRot, string jsonRange, string Name)
{ {
float pX = JsonConvert.DeserializeObject<float>(jsonX); float pX = JsonConvert.DeserializeObject<float>(jsonX);
float pY = (float)JsonConvert.DeserializeObject<float>(jsonY); float pY = (float)JsonConvert.DeserializeObject<float>(jsonY);
@@ -125,11 +125,11 @@ namespace ReallifeGamemode.Server.Gangwar
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
loadTurfs(); loadTurfs();
loadTurfs_ToAllClients(); loadTurfs_ToAllPlayers();
} }
[RemoteEvent("SERVER:DeleteTurf")] [RemoteEvent("SERVER:DeleteTurf")]
public void RmtEvent_DeleteTurf(Client client, string jsonId) public void RmtEvent_DeleteTurf(Player client, string jsonId)
{ {
int id = JsonConvert.DeserializeObject<int>(jsonId); int id = JsonConvert.DeserializeObject<int>(jsonId);
if (id == -1) if (id == -1)
@@ -145,13 +145,13 @@ namespace ReallifeGamemode.Server.Gangwar
dbContext.Turfs.Remove(dturf); dbContext.Turfs.Remove(dturf);
dbContext.SaveChanges(); dbContext.SaveChanges();
loadTurfs(); loadTurfs();
loadTurfs_ToAllClients(); loadTurfs_ToAllPlayers();
} }
} }
} }
[RemoteEvent("SERVER:Turf_SetNewLeaderPoint")] [RemoteEvent("SERVER:Turf_SetNewLeaderPoint")]
public void RmtEvent_SetNewLeaderPoint(Client client, string vector, string jsonId) { public void RmtEvent_SetNewLeaderPoint(Player client, string vector, string jsonId) {
int id = JsonConvert.DeserializeObject<int>(jsonId); int id = JsonConvert.DeserializeObject<int>(jsonId);
if (id == -1) if (id == -1)
{ {
@@ -166,14 +166,14 @@ namespace ReallifeGamemode.Server.Gangwar
dturf.Vector = vector; dturf.Vector = vector;
dbContext.SaveChanges(); dbContext.SaveChanges();
loadTurfs(); loadTurfs();
loadTurfs_ToAllClients(); loadTurfs_ToAllPlayers();
} }
} }
} }
[RemoteEvent("SERVER:StartGangwar")] [RemoteEvent("SERVER:StartGangwar")]
public void RmtEvent_StartGangwar(Client client) public void RmtEvent_StartGangwar(Player client)
{ {
if (!client.GetUser().FactionLeader) if (!client.GetUser().FactionLeader)
return; return;

40
ReallifeGamemode.Server/Gangwar/Turf.cs
View File

@@ -23,9 +23,9 @@ namespace ReallifeGamemode.Server.Gangwar
public int Att_Score { get; set; } public int Att_Score { get; set; }
public int Def_Score { get; set; } public int Def_Score { get; set; }
public string status { get; set; } public string status { get; set; }
public List<Client> playerInside { get; set; } public List<Player> playerInside { get; set; }
public Timer timer { get; set; } public Timer timer { get; set; }
public Client[] playerInGangwar { get; set; } public Player[] playerInGangwar { get; set; }
public int timerCount; public int timerCount;
@@ -40,7 +40,7 @@ namespace ReallifeGamemode.Server.Gangwar
this.Def_Score = 50; this.Def_Score = 50;
this.status = "normal"; this.status = "normal";
this.timer = null; this.timer = null;
this.playerInside = new List<Client>(); this.playerInside = new List<Player>();
this.timerCount = 0; this.timerCount = 0;
} }
@@ -95,8 +95,8 @@ namespace ReallifeGamemode.Server.Gangwar
/* /*
try try
{ {
Client[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.GetUser().Faction.Name == this.Owner).ToArray(); Player[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.GetUser().Faction.Name == this.Owner).ToArray();
Client[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.GetUser().Faction.Name == this.Attacker).ToArray(); Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.GetUser().Faction.Name == this.Attacker).ToArray();
}catch(NullReferenceException ex) }catch(NullReferenceException ex)
{ {
int i = 0; int i = 0;
@@ -115,7 +115,7 @@ namespace ReallifeGamemode.Server.Gangwar
this.Def_Score -= attackers.Length - owners.Length; this.Def_Score -= attackers.Length - owners.Length;
*/ */
#endregion #endregion
foreach (Client gangwarPlayer in this.playerInGangwar) foreach (Player gangwarPlayer in this.playerInGangwar)
{ {
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score); gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, this.Att_Score, this.Def_Score);
} }
@@ -131,7 +131,7 @@ namespace ReallifeGamemode.Server.Gangwar
{ {
if(this.Def_Score > this.Att_Score) if(this.Def_Score > this.Att_Score)
{ {
foreach (Client gangwarPlayer in this.playerInGangwar) foreach (Player gangwarPlayer in this.playerInGangwar)
{ {
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0); gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0);
} }
@@ -139,7 +139,7 @@ namespace ReallifeGamemode.Server.Gangwar
this.Att_Score = 0; this.Att_Score = 0;
}else if(this.Def_Score < this.Att_Score) }else if(this.Def_Score < this.Att_Score)
{ {
foreach (Client gangwarPlayer in this.playerInGangwar) foreach (Player gangwarPlayer in this.playerInGangwar)
{ {
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0); gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0);
} }
@@ -149,7 +149,7 @@ namespace ReallifeGamemode.Server.Gangwar
} }
else if(this.Def_Score == this.Att_Score) else if(this.Def_Score == this.Att_Score)
{ {
foreach (Client gangwarPlayer in this.playerInGangwar) foreach (Player gangwarPlayer in this.playerInGangwar)
{ {
gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0); gangwarPlayer.TriggerEvent("GangwarScore", this.Attacker, this.Owner, 0, 0);
} }
@@ -161,14 +161,14 @@ namespace ReallifeGamemode.Server.Gangwar
} }
} }
public void enter(Client client) public void enter(Player client)
{ {
if (this.status == "attack") if (this.status == "attack")
{ {
if (client.GetUser().Faction.Name != getOwner() && client.GetUser().Faction.Name != getAttacker()) if (client.GetUser().Faction.Name != getOwner() && client.GetUser().Faction.Name != getAttacker())
return; return;
Client gClient = playerInGangwar.Where(c => c.GetUser().Id == client.GetUser().Id).FirstOrDefault(); Player gPlayer = playerInGangwar.Where(c => c.GetUser().Id == client.GetUser().Id).FirstOrDefault();
if (gClient == null) if (gPlayer == null)
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
@@ -185,7 +185,7 @@ namespace ReallifeGamemode.Server.Gangwar
} }
} }
public void leave(Client client) public void leave(Player client)
{ {
if(playerInside.Find(c => c == client) != null) if(playerInside.Find(c => c == client) != null)
{ {
@@ -203,8 +203,8 @@ namespace ReallifeGamemode.Server.Gangwar
{ {
if (getOwner() == FactionName) if (getOwner() == FactionName)
{ {
Client[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Owner).ToArray(); Player[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Owner).ToArray();
Client[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Attacker).ToArray(); Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Attacker).ToArray();
foreach (var o in owners) foreach (var o in owners)
{ {
o.TriggerEvent("CLIENT:win"); o.TriggerEvent("CLIENT:win");
@@ -219,8 +219,8 @@ namespace ReallifeGamemode.Server.Gangwar
else if (getOwner() != FactionName) else if (getOwner() != FactionName)
{ {
ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion konnte das Gebiet ~r~" + getName() + "~w~ nicht verteidigen.", dbContext.Factions.Where(f => f.Name == getOwner()).FirstOrDefault()); ChatService.BroadcastFaction("~y~[GANGWAR] ~w~Deine Fraktion konnte das Gebiet ~r~" + getName() + "~w~ nicht verteidigen.", dbContext.Factions.Where(f => f.Name == getOwner()).FirstOrDefault());
Client[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Owner).ToArray(); Player[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Owner).ToArray();
Client[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Attacker).ToArray(); Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Attacker).ToArray();
foreach (var o in owners) foreach (var o in owners)
{ {
o.TriggerEvent("CLIENT:loose"); o.TriggerEvent("CLIENT:loose");
@@ -247,7 +247,7 @@ namespace ReallifeGamemode.Server.Gangwar
} }
this.playerInGangwar = null; this.playerInGangwar = null;
Gangwar.loadTurfs(); Gangwar.loadTurfs();
Gangwar.loadTurfs_ToAllClients(); Gangwar.loadTurfs_ToAllPlayers();
} }
public void attack(string attacker) public void attack(string attacker)
@@ -263,9 +263,9 @@ namespace ReallifeGamemode.Server.Gangwar
this.status = "attack"; this.status = "attack";
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
{ {
List<Client> clientsInGangwar = new List<Client>(); List<Player> clientsInGangwar = new List<Player>();
Client[] usersInGangwar = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && (c.GetUser().Faction.Name == getOwner() || c.GetUser().Faction.Name == getAttacker())).ToArray(); Player[] usersInGangwar = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && (c.GetUser().Faction.Name == getOwner() || c.GetUser().Faction.Name == getAttacker())).ToArray();
foreach (var u in usersInGangwar) foreach (var u in usersInGangwar)
{ {
u.TriggerEvent("CLIENT:setAttackBlip", true, TurfID); u.TriggerEvent("CLIENT:setAttackBlip", true, TurfID);

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

@@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.Inventory
GroundTextLabels.Add(grndTextLabel); GroundTextLabels.Add(grndTextLabel);
} }
public static void PickUpGroundItem(Client player) public static void PickUpGroundItem(Player player)
{ {
GroundItem nearest = GroundItems.FirstOrDefault(d => d.Position.DistanceTo(player.Position) <= 1.2); GroundItem nearest = GroundItems.FirstOrDefault(d => d.Position.DistanceTo(player.Position) <= 1.2);
if (nearest != null) if (nearest != null)

2
ReallifeGamemode.Server/Inventory/Interfaces/IWeaponDealItem.cs
View File

@@ -8,6 +8,6 @@ namespace ReallifeGamemode.Server.Inventory.Interfaces
{ {
public interface IWeaponDealItem : IItem, IDroppableItem public interface IWeaponDealItem : IItem, IDroppableItem
{ {
bool noTransfer(Client client, UserItem uItem, FactionVehicle fVeh); bool noTransfer(Player client, UserItem uItem, FactionVehicle fVeh);
} }
} }

2
ReallifeGamemode.Server/Inventory/Items/DropItem.cs
View File

@@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
public abstract uint Object { get; } public abstract uint Object { get; }
public abstract int Price { get; } public abstract int Price { get; }
public void Drop(UserItem uItem, Client player, int amount) public void Drop(UserItem uItem, Player player, int amount)
{ {
player.SendNotification("Du hast ~g~" + amount + " ~y~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~weggeworfen.", false); player.SendNotification("Du hast ~g~" + amount + " ~y~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~weggeworfen.", false);
InventoryManager.RemoveUserItem(player.GetUser(), uItem, amount); InventoryManager.RemoveUserItem(player.GetUser(), uItem, amount);

2
ReallifeGamemode.Server/Inventory/Items/FoodItem.cs
View File

@@ -22,7 +22,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
public void Use(UserItem uItem) public void Use(UserItem uItem)
{ {
Client player = uItem.GetUser().Client; Player player = uItem.GetUser().Player;
int amountToAdd = HpAmount; int amountToAdd = HpAmount;
if (player.Health + amountToAdd > 100) if (player.Health + amountToAdd > 100)

2
ReallifeGamemode.Server/Inventory/Items/WeaponDealItem.cs
View File

@@ -19,7 +19,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
public abstract uint Object { get; } public abstract uint Object { get; }
public abstract int Price { get; } public abstract int Price { get; }
public bool noTransfer(Client client, UserItem uItem, FactionVehicle fVeh) public bool noTransfer(Player client, UserItem uItem, FactionVehicle fVeh)
{ {
if (fVeh.FactionId != client.GetUser().FactionId) if (fVeh.FactionId != client.GetUser().FactionId)
return false; return false;

6
ReallifeGamemode.Server/Job/BusDriverJob.cs
View File

@@ -97,7 +97,7 @@ namespace ReallifeGamemode.Server.Job
JobStart += BusDriverJob_JobStart; JobStart += BusDriverJob_JobStart;
} }
private void BusDriverJob_JobStart(Client player) private void BusDriverJob_JobStart(Player player)
{ {
List<String> listRouteTexts = new List<string>(); List<String> listRouteTexts = new List<string>();
List<String> listRouteTexts2 = new List<string>(); List<String> listRouteTexts2 = new List<string>();
@@ -127,7 +127,7 @@ namespace ReallifeGamemode.Server.Job
} }
[RemoteEvent("startBusRoute")] [RemoteEvent("startBusRoute")]
public void StartBusRoute(Client player, string type) public void StartBusRoute(Player player, string type)
{ {
if (type == "Kurz 1") if (type == "Kurz 1")
{ {
@@ -152,7 +152,7 @@ namespace ReallifeGamemode.Server.Job
} }
public static void payWage(Client jobber, int wage) public static void payWage(Player jobber, int wage)
{ {
} }

12
ReallifeGamemode.Server/Job/JobBase.cs
View File

@@ -9,13 +9,13 @@ namespace ReallifeGamemode.Server.Job
{ {
public abstract class JobBase : Script public abstract class JobBase : Script
{ {
public delegate void JobStartHandler(Client player); public delegate void JobStartHandler(Player player);
public delegate void JobStopHandler(Client player); public delegate void JobStopHandler(Player player);
public event JobStartHandler JobStart; public event JobStartHandler JobStart;
public event JobStopHandler JobStop; public event JobStopHandler JobStop;
private readonly List<Client> _inJob = new List<Client>(); private readonly List<Player> _inJob = new List<Player>();
public abstract int Id { get; } public abstract int Id { get; }
@@ -23,7 +23,7 @@ namespace ReallifeGamemode.Server.Job
public abstract bool NeedVehicleToStart { get; } public abstract bool NeedVehicleToStart { get; }
public void StartJob(Client player) public void StartJob(Player player)
{ {
if (_inJob.Contains(player)) return; if (_inJob.Contains(player)) return;
_inJob.Add(player); _inJob.Add(player);
@@ -33,7 +33,7 @@ namespace ReallifeGamemode.Server.Job
JobStart?.Invoke(player); JobStart?.Invoke(player);
} }
public void StopJob(Client player, bool quit = false) public void StopJob(Player player, bool quit = false)
{ {
if (!_inJob.Contains(player)) return; if (!_inJob.Contains(player)) return;
_inJob.Remove(player); _inJob.Remove(player);
@@ -54,6 +54,6 @@ namespace ReallifeGamemode.Server.Job
} }
} }
public List<Client> GetUsersInJob() => _inJob; public List<Player> GetUsersInJob() => _inJob;
} }
} }

4
ReallifeGamemode.Server/Job/PilotJob.cs
View File

@@ -108,7 +108,7 @@ namespace ReallifeGamemode.Server.Job
JobStart += PilotJob_JobStart; JobStart += PilotJob_JobStart;
} }
private void PilotJob_JobStart(Client player) private void PilotJob_JobStart(Player player)
{ {
List<String> listRouteTexts = new List<string>(); List<String> listRouteTexts = new List<string>();
List<String> listRouteTexts2 = new List<string>(); List<String> listRouteTexts2 = new List<string>();
@@ -135,7 +135,7 @@ namespace ReallifeGamemode.Server.Job
} }
[RemoteEvent("startPilotRoute")] [RemoteEvent("startPilotRoute")]
public void StartPilotRoute(Client player, string type) public void StartPilotRoute(Player player, string type)
{ {
if (type == "Route 1") if (type == "Route 1")
{ {

4
ReallifeGamemode.Server/Job/TaxiDriverJob.cs
View File

@@ -22,12 +22,12 @@ namespace ReallifeGamemode.Server.Job
JobStop += TaxiDriverJobJobStop; JobStop += TaxiDriverJobJobStop;
} }
private void TaxiDriverJobJobStart(Client player) private void TaxiDriverJobJobStart(Player player)
{ {
player.Vehicle.SetSharedData("vehicleTaxiLight", true); player.Vehicle.SetSharedData("vehicleTaxiLight", true);
} }
private void TaxiDriverJobJobStop(Client player) private void TaxiDriverJobJobStop(Player player)
{ {
player.Vehicle.SetSharedData("vehicleTaxiLight", false); player.Vehicle.SetSharedData("vehicleTaxiLight", false);
} }

12
ReallifeGamemode.Server/Managers/ATMManager.cs
View File

@@ -73,26 +73,26 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
} }
public static void EnterATMRange(ColShape colShape, Client client) public static void EnterATMRange(ColShape colShape, Player client)
{ {
client.SetData("nearATM", colShape.GetData("id")); client.SetData("nearATM", colShape.GetData<int>("id"));
} }
public static void ExitATMRange(ColShape colShape, Client client) public static void ExitATMRange(ColShape colShape, Player client)
{ {
client.ResetData("nearATM"); client.ResetData("nearATM");
} }
public static void ShowAtmUi(Client player, int atmId) public static void ShowAtmUi(Player player, int atmId)
{ {
player.TriggerEvent("SERVER:ShowAtmUi", atmId); player.TriggerEvent("SERVER:ShowAtmUi", atmId);
} }
[RemoteEvent("CLIENT:ATM_MANAGER:ATM_ACTION")] [RemoteEvent("CLIENT:ATM_MANAGER:ATM_ACTION")]
public void AtmAction(Client client, int site, int inputField1, int inputField2) public void AtmAction(Player client, int site, int inputField1, int inputField2)
{ {
var user = client.GetUser(); var user = client.GetUser();
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
int nearATM = client.GetData("nearATM"); int nearATM = client.GetData<int>("nearATM");
//SITE //0 Geld einzahlen //1 Geld auszahlen //2 Geld überweisen //SITE //0 Geld einzahlen //1 Geld auszahlen //2 Geld überweisen
switch (site) switch (site)
{ {

2
ReallifeGamemode.Server/Managers/BankManager.cs
View File

@@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Managers
{ {
public class BankManager public class BankManager
{ {
public static TransactionResult SetMoney(Client admin, IBankAccountOwner owner, int amount, string reason = "Von Admin gesetzt") public static TransactionResult SetMoney(Player admin, IBankAccountOwner owner, int amount, string reason = "Von Admin gesetzt")
{ {
using (var transferMoney = new DatabaseContext()) using (var transferMoney = new DatabaseContext())
{ {

18
ReallifeGamemode.Server/Managers/BusinessManager.cs
View File

@@ -50,13 +50,13 @@ namespace ReallifeGamemode.Server.Managers
return Businesses.Find(b => b.Id == id); return Businesses.Find(b => b.Id == id);
} }
public static BusinessBase GetNearBusiness(Client player) public static BusinessBase GetNearBusiness(Player player)
{ {
return Businesses.Where(b => b.Position.DistanceTo(player.Position) < 5f).FirstOrDefault(); return Businesses.Where(b => b.Position.DistanceTo(player.Position) < 5f).FirstOrDefault();
} }
[RemoteEvent("Business_DepositMoney")] [RemoteEvent("Business_DepositMoney")]
public void BusinessDepositMoney(Client player, int amount) public void BusinessDepositMoney(Player player, int amount)
{ {
User user = player.GetUser(); User user = player.GetUser();
if (user == null) if (user == null)
@@ -80,14 +80,14 @@ namespace ReallifeGamemode.Server.Managers
} }
else if (result == TransactionResult.SUCCESS) else if (result == TransactionResult.SUCCESS)
{ {
playerBusiness.SendBusinessDataToClient(player); playerBusiness.SendBusinessDataToPlayer(player);
player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen"); player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen");
return; return;
} }
} }
[RemoteEvent("Business_WithdrawMoney")] [RemoteEvent("Business_WithdrawMoney")]
public void BusinessWithdrawMoney(Client player, int amount) public void BusinessWithdrawMoney(Player player, int amount)
{ {
User user = player.GetUser(); User user = player.GetUser();
if (user == null) if (user == null)
@@ -111,14 +111,14 @@ namespace ReallifeGamemode.Server.Managers
} }
else if (result == TransactionResult.SUCCESS) else if (result == TransactionResult.SUCCESS)
{ {
playerBusiness.SendBusinessDataToClient(player); playerBusiness.SendBusinessDataToPlayer(player);
player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen"); player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen");
return; return;
} }
} }
[ServerEvent(Event.PlayerEnterVehicle)] [ServerEvent(Event.PlayerEnterVehicle)]
public void CarDealerBusiness_PlayerEnterVehicle(Client player, Vehicle veh, int seat) public void CarDealerBusiness_PlayerEnterVehicle(Player player, Vehicle veh, int seat)
{ {
ServerVehicle sVeh = veh.GetServerVehicle(); ServerVehicle sVeh = veh.GetServerVehicle();
if (sVeh == null) return; if (sVeh == null) return;
@@ -137,7 +137,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("VehShop_BuyVehicle")] [RemoteEvent("VehShop_BuyVehicle")]
public void CarDealerBusiness_BuyVehicle(Client player, string target) public void CarDealerBusiness_BuyVehicle(Player player, string target)
{ {
ServerVehicle sVeh = player.Vehicle?.GetServerVehicle(); ServerVehicle sVeh = player.Vehicle?.GetServerVehicle();
if (sVeh == null) return; if (sVeh == null) return;
@@ -217,7 +217,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("CLIENT:Business_BuyBusiness")] [RemoteEvent("CLIENT:Business_BuyBusiness")]
public void BusinessEventBuyBusiness(Client player) public void BusinessEventBuyBusiness(Player player)
{ {
BusinessBase business = GetNearBusiness(player); BusinessBase business = GetNearBusiness(player);
if (business == null) return; if (business == null) return;
@@ -258,7 +258,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("CLIENT:Business_SellBusiness")] [RemoteEvent("CLIENT:Business_SellBusiness")]
public void BusinessEventSellBusiness(Client player) public void BusinessEventSellBusiness(Player player)
{ {
BusinessBase business = GetNearBusiness(player); BusinessBase business = GetNearBusiness(player);
if (business == null) return; if (business == null) return;

6
ReallifeGamemode.Server/Managers/CharacterCreator.cs
View File

@@ -13,7 +13,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("creatorSave")] [RemoteEvent("creatorSave")]
public void CreatorSave(Client player, bool gender, string parentData, string featureData, string appearanceData, string hairAndColorData) public void CreatorSave(Player player, bool gender, string parentData, string featureData, string appearanceData, string hairAndColorData)
{ {
var jParentData = JObject.Parse(parentData); var jParentData = JObject.Parse(parentData);
var jFeatureData = JArray.Parse(featureData); var jFeatureData = JArray.Parse(featureData);
@@ -178,8 +178,8 @@ namespace ReallifeGamemode.Server.Managers
/// <summary> /// <summary>
/// Wendet den Character eines Spielers auf diesen an /// Wendet den Character eines Spielers auf diesen an
/// </summary> /// </summary>
/// <param name="player">Der Client, dessen Aussehen man setzen will</param> /// <param name="player">Der Player, dessen Aussehen man setzen will</param>
public static void ApplyCharacter(Client player) public static void ApplyCharacter(Player player)
{ {
var userId = player.GetUser().Id; var userId = player.GetUser().Id;
using (var loadCharacter = new DatabaseContext()) using (var loadCharacter = new DatabaseContext())

2
ReallifeGamemode.Server/Managers/CityHallManager.cs
View File

@@ -35,7 +35,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("CLIENT:CityHall_CreateGroup")] [RemoteEvent("CLIENT:CityHall_CreateGroup")]
public void CreateGroup(Client player, string name) public void CreateGroup(Player player, string name)
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {

4
ReallifeGamemode.Server/Managers/DoorManager.cs
View File

@@ -39,7 +39,7 @@ namespace ReallifeGamemode.Server.Managers
LoadDoors(); LoadDoors();
} }
public static void ChangeDoorState(Client player) public static void ChangeDoorState(Player player)
{ {
var user = player.GetUser(); var user = player.GetUser();
@@ -68,7 +68,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[ServerEvent(Event.PlayerEnterColshape)] [ServerEvent(Event.PlayerEnterColshape)]
public void DoorManagerPlayerEnterColShapeEvent(ColShape colShape, Client player) public void DoorManagerPlayerEnterColShapeEvent(ColShape colShape, Player player)
{ {
if (_doorColShapes.ContainsValue(colShape.Handle)) if (_doorColShapes.ContainsValue(colShape.Handle))
{ {

38
ReallifeGamemode.Server/Managers/HouseManager.cs
View File

@@ -12,14 +12,14 @@ using System.Text;
namespace ReallifeGamemode.Server.Managers namespace ReallifeGamemode.Server.Managers
{ {
class HouseManager : Script class HouseManager
{ {
private static readonly Dictionary<int, NetHandle> houseMarkers = new Dictionary<int, NetHandle>(); private static readonly Dictionary<int, NetHandle> houseMarkers = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, NetHandle> houseLabels = new Dictionary<int, NetHandle>(); private static readonly Dictionary<int, NetHandle> houseLabels = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, NetHandle> houseColShapes = new Dictionary<int, NetHandle>(); private static readonly Dictionary<int, NetHandle> houseColShapes = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, NetHandle> houseBlips = new Dictionary<int, NetHandle>(); private static readonly Dictionary<int, NetHandle> houseBlips = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, List<Client>> playerInColShape = new Dictionary<int, List<Client>>(); private static readonly Dictionary<int, List<Player>> playerInColShape = new Dictionary<int, List<Player>>();
public static async void LoadHouses() public static async void LoadHouses()
{ {
@@ -99,7 +99,7 @@ namespace ReallifeGamemode.Server.Managers
{ {
if (loadUser) house = house.Refresh(); if (loadUser) house = house.Refresh();
playerInColShape[house.Id] = new List<Client>(); playerInColShape[house.Id] = new List<Player>();
houseMarkers[house.Id] = NAPI.Marker.CreateMarker(MarkerType.VerticalCylinder, house.Position.Subtract(new Vector3(0, 0, 1.7)), new Vector3(), new Vector3(), 1.6f, new Color(255, 255, 255)); houseMarkers[house.Id] = NAPI.Marker.CreateMarker(MarkerType.VerticalCylinder, house.Position.Subtract(new Vector3(0, 0, 1.7)), new Vector3(), new Vector3(), 1.6f, new Color(255, 255, 255));
string text = $"~g~Zum Verkauf\n~s~{house.Type}\nPreis: ~y~{(house.Price == 0 ? "~r~Nicht verkäuflich" : house.Price.ToMoneyString())}"; string text = $"~g~Zum Verkauf\n~s~{house.Type}\nPreis: ~y~{(house.Price == 0 ? "~r~Nicht verkäuflich" : house.Price.ToMoneyString())}";
@@ -127,7 +127,7 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
private static void HouseManager_OnEntityExitColShape(ColShape colShape, Client client) private static void HouseManager_OnEntityExitColShape(ColShape colShape, Player client)
{ {
if (!client.IsLoggedIn() || client.IsInVehicle) return; if (!client.IsLoggedIn() || client.IsInVehicle) return;
if (!houseColShapes.ContainsValue(colShape.Handle)) if (!houseColShapes.ContainsValue(colShape.Handle))
@@ -140,7 +140,7 @@ namespace ReallifeGamemode.Server.Managers
client.TriggerEvent("SERVER:CloseHouseMenu"); client.TriggerEvent("SERVER:CloseHouseMenu");
} }
private static void HouseManager_OnEntityEnterColShape(ColShape colShape, Client client) private static void HouseManager_OnEntityEnterColShape(ColShape colShape, Player client)
{ {
if (!client.IsLoggedIn() || client.IsInVehicle) return; if (!client.IsLoggedIn() || client.IsInVehicle) return;
if (!houseColShapes.ContainsValue(colShape.Handle)) if (!houseColShapes.ContainsValue(colShape.Handle))
@@ -153,10 +153,10 @@ namespace ReallifeGamemode.Server.Managers
User user = client.GetUser(); User user = client.GetUser();
client.TriggerEvent("SERVER:ShowHouseMenu"); client.TriggerEvent("SERVER:ShowHouseMenu");
SendClientHouseData(client, house); SendPlayerHouseData(client, house);
} }
private static void SendClientHouseData(Client player, House house) private static void SendPlayerHouseData(Player player, House house)
{ {
User user = player.GetUser(); User user = player.GetUser();
var userHouseStatus = -1; var userHouseStatus = -1;
@@ -208,14 +208,14 @@ namespace ReallifeGamemode.Server.Managers
houseBlips.Remove(house.Id); houseBlips.Remove(house.Id);
} }
foreach (Client client in playerInColShape[house.Id]) foreach (Player client in playerInColShape[house.Id])
{ {
client.TriggerEvent("SERVER:CloseHouseMenu"); client.TriggerEvent("SERVER:CloseHouseMenu");
} }
} }
[RemoteEvent("CLIENT:House_BuyHouse")] [RemoteEvent("CLIENT:House_BuyHouse")]
public void HouseManagerBuyHouseEvent(Client player) public void HouseManagerBuyHouseEvent(Player player)
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
@@ -250,7 +250,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("CLIENT:House_SetRentalFee")] [RemoteEvent("CLIENT:House_SetRentalFee")]
public void HouseManagerSetRentalFeeEvent(Client player, int rentalFee) public void HouseManagerSetRentalFeeEvent(Player player, int rentalFee)
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
@@ -276,7 +276,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("CLIENT:House_CancelUserRental")] [RemoteEvent("CLIENT:House_CancelUserRental")]
public void HouseManagerCancelUserRentalEvent(Client player, string userName) public void HouseManagerCancelUserRentalEvent(Player player, string userName)
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
@@ -306,15 +306,15 @@ namespace ReallifeGamemode.Server.Managers
dbContext.HouseRentals.Remove(rental); dbContext.HouseRentals.Remove(rental);
dbContext.SaveChanges(); dbContext.SaveChanges();
target.Client?.SendNotification($"~y~{player.Name}~s~ hat deinen Mietvertrag ~g~gekündigt~s~."); target.Player?.SendNotification($"~y~{player.Name}~s~ hat deinen Mietvertrag ~g~gekündigt~s~.");
player.SendNotification("Du hast dem Spieler ~y~" + target.Name + "~s~ den Mietvertrag gekündigt."); player.SendNotification("Du hast dem Spieler ~y~" + target.Name + "~s~ den Mietvertrag gekündigt.");
SendClientHouseData(player, house); SendPlayerHouseData(player, house);
} }
} }
[RemoteEvent("CLIENT:House_RentInHouse")] [RemoteEvent("CLIENT:House_RentInHouse")]
public void HouseManagerRentInHouseEvent(Client player) public void HouseManagerRentInHouseEvent(Player player)
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
@@ -340,12 +340,12 @@ namespace ReallifeGamemode.Server.Managers
player.SendNotification("~g~Du hast dich in das Haus eingemietet"); player.SendNotification("~g~Du hast dich in das Haus eingemietet");
house.User?.SendNotification($"~y~{player.Name}~s~ hat sich in dein Haus eingemietet."); house.User?.SendNotification($"~y~{player.Name}~s~ hat sich in dein Haus eingemietet.");
SendClientHouseData(player, house); SendPlayerHouseData(player, house);
} }
} }
[RemoteEvent("CLIENT:House_CancelOwnRental")] [RemoteEvent("CLIENT:House_CancelOwnRental")]
public void HouseManagerCancelOwnRentalEvent(Client player) public void HouseManagerCancelOwnRentalEvent(Player player)
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
@@ -376,12 +376,12 @@ namespace ReallifeGamemode.Server.Managers
RemoveHouse(house); RemoveHouse(house);
LoadHouse(house); LoadHouse(house);
SendClientHouseData(player, house); SendPlayerHouseData(player, house);
} }
} }
[RemoteEvent("CLIENT:House_SellHouse")] [RemoteEvent("CLIENT:House_SellHouse")]
public void HouseManagerSellHouseEvent(Client player) public void HouseManagerSellHouseEvent(Player player)
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
@@ -404,7 +404,7 @@ namespace ReallifeGamemode.Server.Managers
RemoveHouse(house); RemoveHouse(house);
LoadHouse(house); LoadHouse(house);
SendClientHouseData(player, house); SendPlayerHouseData(player, house);
} }
} }
} }

32
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -27,7 +27,7 @@ namespace ReallifeGamemode.Server.Managers
#endregion #endregion
#region Eigeninteraktionen PFEILTASTE-RUNTER #region Eigeninteraktionen PFEILTASTE-RUNTER
[RemoteEvent("CLIENT:InteractionMenu_AcceptInvite")] [RemoteEvent("CLIENT:InteractionMenu_AcceptInvite")]
public void InteractionMenuAcceptInvite(Client player, string type) public void InteractionMenuAcceptInvite(Player player, string type)
{ {
if (type != "Fraktion" && type != "Gruppe") return; if (type != "Fraktion" && type != "Gruppe") return;
@@ -39,7 +39,7 @@ namespace ReallifeGamemode.Server.Managers
return; return;
} }
Client leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_faction_invite")); Player leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData<NetHandle>("accept_faction_invite"));
player.ResetData("accept_faction_invite"); player.ResetData("accept_faction_invite");
if (leader == null) if (leader == null)
@@ -91,7 +91,7 @@ namespace ReallifeGamemode.Server.Managers
return; return;
} }
Client leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_group_invite")); Player leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData<NetHandle>("accept_group_invite"));
player.ResetData("accept_group_invite"); player.ResetData("accept_group_invite");
if (leader == null) if (leader == null)
@@ -116,18 +116,18 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
[RemoteEvent("CLIENT:InteractionMenu_EndShow")] [RemoteEvent("CLIENT:InteractionMenu_EndShow")]
public void InteractionMenuEndShow(Client client) public void InteractionMenuEndShow(Player client)
{ {
client.ResetData("ShowActive"); client.ResetData("ShowActive");
} }
[RemoteEvent("CLIENT:InteractionMenu_Show")] [RemoteEvent("CLIENT:InteractionMenu_Show")]
public void InteractionMenuShow(Client player, string type, string nameOrId) public void InteractionMenuShow(Player player, string type, string nameOrId)
{ {
if (type != "License") if (type != "License")
return; return;
Client target = ClientService.GetClientByNameOrId(nameOrId); Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
if (target == null || !target.IsLoggedIn()) if (target == null || !target.IsLoggedIn())
{ {
ChatService.PlayerNotFound(player); ChatService.PlayerNotFound(player);
@@ -163,11 +163,11 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("CLIENT:InteractionMenu_Invite")] [RemoteEvent("CLIENT:InteractionMenu_Invite")]
public void InteractionMenuInviteFaction(Client player, string type, string nameOrId) public void InteractionMenuInviteFaction(Player player, string type, string nameOrId)
{ {
if (type != "Fraktion" && type != "Gruppe") return; if (type != "Fraktion" && type != "Gruppe") return;
Client target = ClientService.GetClientByNameOrId(nameOrId); Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
if (target == null || !target.IsLoggedIn()) if (target == null || !target.IsLoggedIn())
{ {
ChatService.PlayerNotFound(player); ChatService.PlayerNotFound(player);
@@ -220,11 +220,11 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("CLIENT:InteractionMenu_Uninvite")] [RemoteEvent("CLIENT:InteractionMenu_Uninvite")]
public void InteractionMenuInviteGroup(Client player, string type, string name) public void InteractionMenuInviteGroup(Player player, string type, string name)
{ {
if (type != "Fraktion" && type != "Gruppe") return; if (type != "Fraktion" && type != "Gruppe") return;
Client target = ClientService.GetClientByNameOrId(name); Player target = PlayerService.GetPlayerByNameOrId(name);
if (target == null || !target.IsLoggedIn()) if (target == null || !target.IsLoggedIn())
{ {
ChatService.PlayerNotFound(player); ChatService.PlayerNotFound(player);
@@ -313,7 +313,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("CLIENT:InteractionMenu_CallService_Taxi")] [RemoteEvent("CLIENT:InteractionMenu_CallService_Taxi")]
public void CallServiceTaxi(Client player, string street, string zone) public void CallServiceTaxi(Player player, string street, string zone)
{ {
var taxiJob = JobManager.GetJob<TaxiDriverJob>(); var taxiJob = JobManager.GetJob<TaxiDriverJob>();
@@ -336,27 +336,27 @@ namespace ReallifeGamemode.Server.Managers
#endregion #endregion
#region Spielerinteraktionen PFEILTASTE-LINKS #region Spielerinteraktionen PFEILTASTE-LINKS
[RemoteEvent("openTradeInventory")] [RemoteEvent("openTradeInventory")]
public void OpenTradeInventory(Client player, string targetPlayer) public void OpenTradeInventory(Player player, string targetPlayer)
{ {
InventoryManager.GetUserItems(player); InventoryManager.GetUserItems(player);
player.TriggerEvent("openTradeMenu", targetPlayer); player.TriggerEvent("openTradeMenu", targetPlayer);
} }
[RemoteEvent("sendTradeItemsToPartner")] [RemoteEvent("sendTradeItemsToPartner")]
public void SendTradeItemsToPartner(Client player, string tradeItemArray, int tradePrize, string tradePartnerName) public void SendTradeItemsToPartner(Player player, string tradeItemArray, int tradePrize, string tradePartnerName)
{ {
var tradeItems = JsonConvert.DeserializeObject<string[][]>(tradeItemArray); var tradeItems = JsonConvert.DeserializeObject<string[][]>(tradeItemArray);
Client tradePartner = ClientService.GetClientByNameOrId(tradePartnerName); Player tradePartner = PlayerService.GetPlayerByNameOrId(tradePartnerName);
InventoryManager.GetUserItems(player); InventoryManager.GetUserItems(player);
tradePartner.TriggerEvent("showTradeRequest", player.Name, tradeItems, tradePrize); tradePartner.TriggerEvent("showTradeRequest", player.Name, tradeItems, tradePrize);
player.TriggerEvent("startTradeRequestTimer"); player.TriggerEvent("startTradeRequestTimer");
} }
[RemoteEvent("tradeDecision")] [RemoteEvent("tradeDecision")]
public void TradeDecision(Client player, string tradeSelection, string tradeItemArray, string tradeRequesterName, int tradePrize) public void TradeDecision(Player player, string tradeSelection, string tradeItemArray, string tradeRequesterName, int tradePrize)
{ {
var tradeItems = JsonConvert.DeserializeObject<string[][]>(tradeItemArray); var tradeItems = JsonConvert.DeserializeObject<string[][]>(tradeItemArray);
Client tradeRequester = ClientService.GetClientByNameOrId(tradeRequesterName); Player tradeRequester = PlayerService.GetPlayerByNameOrId(tradeRequesterName);
if (tradeSelection == "accept") if (tradeSelection == "accept")
{ {
if (player.GetUser().Handmoney < tradePrize) if (player.GetUser().Handmoney < tradePrize)

6
ReallifeGamemode.Server/Managers/InteriorManager.cs
View File

@@ -110,7 +110,7 @@ namespace ReallifeGamemode.Server.Managers
public static int GetInteriorIdFromExitColShape(NetHandle handle) => _interiorExitColShapes.FirstOrDefault(c => c.Value.Value == handle.Value).Key; public static int GetInteriorIdFromExitColShape(NetHandle handle) => _interiorExitColShapes.FirstOrDefault(c => c.Value.Value == handle.Value).Key;
[ServerEvent(Event.PlayerEnterColshape)] [ServerEvent(Event.PlayerEnterColshape)]
public void InteriorManagerPlayerEnterColshapeEvent(ColShape colShape, Client player) public void InteriorManagerPlayerEnterColshapeEvent(ColShape colShape, Player player)
{ {
int enterId = GetInteriorIdFromEnterColShape(colShape); int enterId = GetInteriorIdFromEnterColShape(colShape);
int exitId = GetInteriorIdFromExitColShape(colShape); int exitId = GetInteriorIdFromExitColShape(colShape);
@@ -127,7 +127,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[ServerEvent(Event.PlayerExitColshape)] [ServerEvent(Event.PlayerExitColshape)]
public void InteriorManagerPlayerExitColshapeEvent(ColShape colShape, Client player) public void InteriorManagerPlayerExitColshapeEvent(ColShape colShape, Player player)
{ {
if (GetInteriorIdFromEnterColShape(colShape) != 0 || GetInteriorIdFromExitColShape(colShape) != 0) if (GetInteriorIdFromEnterColShape(colShape) != 0 || GetInteriorIdFromExitColShape(colShape) != 0)
{ {
@@ -136,7 +136,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("InteriorManager_UseTeleport")] [RemoteEvent("InteriorManager_UseTeleport")]
public void InteriorManagerUseTeleportEvent(Client player, int id, int enterExit) public void InteriorManagerUseTeleportEvent(Player player, int id, int enterExit)
{ {
Interior interior = GetInteriorById(id); Interior interior = GetInteriorById(id);
player.Position = enterExit == 0 ? interior.ExitPosition : interior.EnterPosition; player.Position = enterExit == 0 ? interior.ExitPosition : interior.EnterPosition;

62
ReallifeGamemode.Server/Managers/InventoryManager.cs
View File

@@ -81,7 +81,7 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
public static void GetUserItems(Client player) public static void GetUserItems(Player player)
{ {
var user = player.GetUser(); var user = player.GetUser();
var inventoryWeight = 0; var inventoryWeight = 0;
@@ -106,7 +106,7 @@ namespace ReallifeGamemode.Server.Managers
iId.Add(iItem.Id); iId.Add(iItem.Id);
} }
List<Client> targetList = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player); List<Player> targetList = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player);
List<string> username = new List<string>(); List<string> username = new List<string>();
foreach (var target in targetList) foreach (var target in targetList)
{ {
@@ -118,7 +118,7 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
public static int GetUserInventoryWeight(Client player) public static int GetUserInventoryWeight(Player player)
{ {
var user = player.GetUser(); var user = player.GetUser();
var inventoryWeight = 0; var inventoryWeight = 0;
@@ -157,7 +157,7 @@ namespace ReallifeGamemode.Server.Managers
return inventoryWeight; return inventoryWeight;
} }
public static UserItem UserHasThisItem(Client player, int itemId) public static UserItem UserHasThisItem(Player player, int itemId)
{ {
var user = player.GetUser(); var user = player.GetUser();
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
@@ -167,7 +167,7 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
public static void GetUserItemsAsAdmin(Client player, User user) public static void GetUserItemsAsAdmin(Player player, User user)
{ {
var inventoryWeight = 0; var inventoryWeight = 0;
@@ -193,7 +193,7 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
public bool CheckOriginOfItem(Client client, string jsonItemID, string jsonItemAmount, string jsonOrigin, string jsonVehAmount) public bool CheckOriginOfItem(Player client, string jsonItemID, string jsonItemAmount, string jsonOrigin, string jsonVehAmount)
{ {
var origin = JsonConvert.DeserializeObject<int[]>(jsonOrigin); var origin = JsonConvert.DeserializeObject<int[]>(jsonOrigin);
var itemID = JsonConvert.DeserializeObject<int>(jsonItemID); var itemID = JsonConvert.DeserializeObject<int>(jsonItemID);
@@ -359,7 +359,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("saveVehicleInventory")] [RemoteEvent("saveVehicleInventory")]
public void SaveVehicleInventory(Client player, string jsonItemID, string jsonItemAmount, string jsonGotFrom, string vehAmount) public void SaveVehicleInventory(Player player, string jsonItemID, string jsonItemAmount, string jsonGotFrom, string vehAmount)
{ {
var itemID = JsonConvert.DeserializeObject<int>(jsonItemID); var itemID = JsonConvert.DeserializeObject<int>(jsonItemID);
var itemAmount = JsonConvert.DeserializeObject<int>(jsonItemAmount); var itemAmount = JsonConvert.DeserializeObject<int>(jsonItemAmount);
@@ -400,7 +400,7 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("saveInventory")] [RemoteEvent("saveInventory")]
public void SavePlayerInventory(Client player, string jsonItemID, string jsonItemAmount, string jsonGotFrom, string vehAmount) public void SavePlayerInventory(Player player, string jsonItemID, string jsonItemAmount, string jsonGotFrom, string vehAmount)
{ {
var user = player.GetUser(); var user = player.GetUser();
@@ -443,7 +443,7 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
public static void AddItemToInventory(Client player, UserItem item) public static void AddItemToInventory(Player player, UserItem item)
{ {
var user = player.GetUser(); var user = player.GetUser();
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
@@ -477,7 +477,7 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
public static void AddItemToVehicleInventory(Client player, VehicleItem item, Vehicle veh) public static void AddItemToVehicleInventory(Player player, VehicleItem item, Vehicle veh)
{ {
var user = player.GetUser(); var user = player.GetUser();
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
@@ -525,13 +525,13 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("removeItemAsAdmin")] [RemoteEvent("removeItemAsAdmin")]
public void RemoveAsAdminInventory(Client player, string amount, string userItemId, string targetPlayerName) public void RemoveAsAdminInventory(Player player, string amount, string userItemId, string targetPlayerName)
{ {
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
{ {
UserItem fItem = context.UserItems.FirstOrDefault(j => j.Id == int.Parse(userItemId)); UserItem fItem = context.UserItems.FirstOrDefault(j => j.Id == int.Parse(userItemId));
Client targetPlayer = ClientService.GetClientByNameOrId(targetPlayerName); Player targetPlayer = PlayerService.GetPlayerByNameOrId(targetPlayerName);
if (amount == "stack") if (amount == "stack")
{ {
@@ -550,7 +550,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("itemInteract")] [RemoteEvent("itemInteract")]
public void ItemInteract(Client player, string jsonType, string jsonAmount, string jsonItemId) public void ItemInteract(Player player, string jsonType, string jsonAmount, string jsonItemId)
{ {
int amount = JsonConvert.DeserializeObject<int>(jsonAmount); int amount = JsonConvert.DeserializeObject<int>(jsonAmount);
int itemId = JsonConvert.DeserializeObject<int>(jsonItemId); int itemId = JsonConvert.DeserializeObject<int>(jsonItemId);
@@ -602,7 +602,7 @@ namespace ReallifeGamemode.Server.Managers
if (iItem is IDroppableItem usableItemObj2) if (iItem is IDroppableItem usableItemObj2)
{ {
Vector3 dropPosition = ClientExtension.GetPositionFromPlayer(player, 0.6f, 0); Vector3 dropPosition = PlayerExtension.GetPositionFromPlayer(player, 0.6f, 0);
//new Vector3(player.Position.X, player.Position.Y, player.Position.Z - 0.8f); //new Vector3(player.Position.X, player.Position.Y, player.Position.Z - 0.8f);
Random r = new Random(); Random r = new Random();
GTANetworkAPI.Object grndObject; GTANetworkAPI.Object grndObject;
@@ -638,11 +638,11 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("tradeItem")] [RemoteEvent("tradeItem")]
public void ServerEvent_tradeItem(Client client, int value, string jsonNameOrId, string itemIdArrStr, string itemAmountArrStr) public void ServerEvent_tradeItem(Player client, int value, string jsonNameOrId, string itemIdArrStr, string itemAmountArrStr)
{ {
User user = client.GetUser(); User user = client.GetUser();
string nameOrId = JsonConvert.DeserializeObject<string>(jsonNameOrId); string nameOrId = JsonConvert.DeserializeObject<string>(jsonNameOrId);
Client target = ClientService.GetClientByNameOrId(nameOrId); Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
if (target == null || !target.IsLoggedIn() || target == client) if (target == null || !target.IsLoggedIn() || target == client)
{ {
ChatService.PlayerNotFound(client); ChatService.PlayerNotFound(client);
@@ -658,7 +658,7 @@ namespace ReallifeGamemode.Server.Managers
List<string> itemNameList = new List<string>(); List<string> itemNameList = new List<string>();
if (target.HasData("inTrade") && target.GetData("inTrade") == true) if (target.HasData("inTrade") && target.GetData<bool>("inTrade") == true)
{ {
ChatService.SendMessage(client, $"~r~[FEHLER] ~w~{target.Name} befindet sich bereits in einem Handel."); ChatService.SendMessage(client, $"~r~[FEHLER] ~w~{target.Name} befindet sich bereits in einem Handel.");
return; return;
@@ -710,7 +710,7 @@ namespace ReallifeGamemode.Server.Managers
target.TriggerEvent("addTradeItems", itemIdArr, itemAmountArr, itemNameList.ToArray(), inventoryWeight); target.TriggerEvent("addTradeItems", itemIdArr, itemAmountArr, itemNameList.ToArray(), inventoryWeight);
} }
public void SendTradeOffer(Client client, Client sender) public void SendTradeOffer(Player client, Player sender)
{ {
client.SetData("inTrade", true); client.SetData("inTrade", true);
sender.SetData("inTrade", true); sender.SetData("inTrade", true);
@@ -723,7 +723,7 @@ namespace ReallifeGamemode.Server.Managers
tradeTimer.Elapsed += (s, e) => { SendBackToSender(sender); client.SetData("inTrade", false); sender.SetData("inTrade", false); client.SetSharedData("tradeOffer", JsonConvert.SerializeObject(0)); }; tradeTimer.Elapsed += (s, e) => { SendBackToSender(sender); client.SetData("inTrade", false); sender.SetData("inTrade", false); client.SetSharedData("tradeOffer", JsonConvert.SerializeObject(0)); };
} }
public void SendBackToSender(Client client) public void SendBackToSender(Player client)
{ {
User user = client.GetUser(); User user = client.GetUser();
ChatService.SendMessage(client, "Dein Handelspartner hat die Anfrage nicht angenommen."); ChatService.SendMessage(client, "Dein Handelspartner hat die Anfrage nicht angenommen.");
@@ -759,16 +759,16 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("declineTrade")] [RemoteEvent("declineTrade")]
public void ServerEvent_declineTrade(Client client) public void ServerEvent_declineTrade(Player client)
{ {
client.SetSharedData("tradeOffer", JsonConvert.SerializeObject(0)); client.SetSharedData("tradeOffer", JsonConvert.SerializeObject(0));
if (!client.GetData("inTrade")) if (!client.GetData<bool>("inTrade"))
{ {
ChatService.ErrorMessage(client, "Das Handelsangebot ist abgelaufen."); ChatService.ErrorMessage(client, "Das Handelsangebot ist abgelaufen.");
return; return;
} }
string name = client.GetData("trade"); string name = client.GetData<string>("trade");
Client target = ClientService.GetClientByNameOrId(name); Player target = PlayerService.GetPlayerByNameOrId(name);
if (target == null || !target.IsLoggedIn()) if (target == null || !target.IsLoggedIn())
{ {
ChatService.PlayerNotFound(client); ChatService.PlayerNotFound(client);
@@ -780,10 +780,10 @@ namespace ReallifeGamemode.Server.Managers
SendBackToSender(target); SendBackToSender(target);
} }
public static void OpenTradeAccept(Client client) public static void OpenTradeAccept(Player client)
{ {
User user = client.GetUser(); User user = client.GetUser();
int id = client.GetData("tradePartner"); int id = client.GetData<int>("tradePartner");
(int[] itemIdArr, int[] itemAmountArr) = TradeItems[id]; (int[] itemIdArr, int[] itemAmountArr) = TradeItems[id];
Timer tradeTimer = TradeTimer[id]; Timer tradeTimer = TradeTimer[id];
tradeTimer.Stop(); tradeTimer.Stop();
@@ -792,9 +792,9 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("acceptTrade")] [RemoteEvent("acceptTrade")]
public void ServerEvent_AcceptTrade(Client client) public void ServerEvent_AcceptTrade(Player client)
{ {
if (!client.GetData("inTrade")) if (!client.GetData<bool>("inTrade"))
{ {
ChatService.ErrorMessage(client, "Das Handelsangebot ist abgelaufen."); ChatService.ErrorMessage(client, "Das Handelsangebot ist abgelaufen.");
return; return;
@@ -803,12 +803,12 @@ namespace ReallifeGamemode.Server.Managers
client.SetData("inTrade", false); client.SetData("inTrade", false);
User user = client.GetUser(); User user = client.GetUser();
int id = client.GetData("tradePartner"); int id = client.GetData<int>("tradePartner");
(int[] itemIdArr, int[] itemAmountArr) = TradeItems[id]; (int[] itemIdArr, int[] itemAmountArr) = TradeItems[id];
Timer tradeTimer = TradeTimer[id]; Timer tradeTimer = TradeTimer[id];
tradeTimer.Stop(); tradeTimer.Stop();
string name = client.GetData("trade"); string name = client.GetData<string>("trade");
Client target = ClientService.GetClientByNameOrId(name); Player target = PlayerService.GetPlayerByNameOrId(name);
if (target == null || !target.IsLoggedIn()) if (target == null || !target.IsLoggedIn())
{ {
ChatService.PlayerNotFound(client); ChatService.PlayerNotFound(client);
@@ -865,7 +865,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("SERVER:BuyItems")] [RemoteEvent("SERVER:BuyItems")]
public void SrvEvent_BuyItem(Client client, string itemName) public void SrvEvent_BuyItem(Player client, string itemName)
{ {
IItem shopItem = GetItemByName(itemName); IItem shopItem = GetItemByName(itemName);

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

6
ReallifeGamemode.Server/Managers/SaveManager.cs
View File

@@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Managers
{ {
[RemoteEvent("OnSaveBlipData")] [RemoteEvent("OnSaveBlipData")]
public static void OnSaveBlipData(Client player, string blipSprite, string blipName, string blipScale, string blipColor, public static void OnSaveBlipData(Player player, string blipSprite, string blipName, string blipScale, string blipColor,
string blipAlpha, string blipDrawDistance, string blipShortRange, string blipRotation, string blipDimension) string blipAlpha, string blipDrawDistance, string blipShortRange, string blipRotation, string blipDimension)
{ {
float x = player.Position.X; float x = player.Position.X;
@@ -185,7 +185,7 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
public static void SaveGotoPoint(Client player, string description) public static void SaveGotoPoint(Player player, string description)
{ {
using (var saveData = new DatabaseContext()) using (var saveData = new DatabaseContext())
{ {
@@ -207,7 +207,7 @@ namespace ReallifeGamemode.Server.Managers
using (var saveAll = new DatabaseContext()) using (var saveAll = new DatabaseContext())
{ {
//Alle Spieler //Alle Spieler
foreach (Client player in NAPI.Pools.GetAllPlayers()) foreach (Player player in NAPI.Pools.GetAllPlayers())
{ {
Vector3 pos = player.Position; Vector3 pos = player.Position;
User user = player.GetUser(saveAll); User user = player.GetUser(saveAll);

6
ReallifeGamemode.Server/Managers/TuningManager.cs
View File

@@ -79,7 +79,7 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("startPlayerTuning")] [RemoteEvent("startPlayerTuning")]
public void StartPlayerTuning(Client player) public void StartPlayerTuning(Player player)
{ {
if (!player.IsInVehicle) return; if (!player.IsInVehicle) return;
@@ -87,14 +87,14 @@ namespace ReallifeGamemode.Server.Managers
} }
[RemoteEvent("repairVehicle")] [RemoteEvent("repairVehicle")]
public void RepairVehicle(Client player) public void RepairVehicle(Player player)
{ {
if (!player.IsInVehicle) return; if (!player.IsInVehicle) return;
player.Vehicle.Repair(); player.Vehicle.Repair();
} }
[RemoteEvent("setVehicleMod")] [RemoteEvent("setVehicleMod")]
public void SetVehicleMod(Client player, int slot, int index) public void SetVehicleMod(Player player, int slot, int index)
{ {
Vehicle pV = player.Vehicle; Vehicle pV = player.Vehicle;
if (index == 0) index--; if (index == 0) index--;

5
ReallifeGamemode.Server/Managers/VehicleManager.cs
View File

@@ -747,7 +747,7 @@ namespace ReallifeGamemode.Server.Managers
double distanceDriven; double distanceDriven;
try try
{ {
distanceDriven = v.HasSharedData("drivenDistance") ? (double)v.GetSharedData("drivenDistance") : 0D; distanceDriven = v.HasSharedData("drivenDistance") ? (double)v.GetSharedData<dynamic>("drivenDistance") : 0D;
} }
catch (Microsoft.CSharp.RuntimeBinder.RuntimeBinderException) catch (Microsoft.CSharp.RuntimeBinder.RuntimeBinderException)
{ {
@@ -770,13 +770,14 @@ namespace ReallifeGamemode.Server.Managers
foreach (var key in lastPositions.Keys.ToList()) foreach (var key in lastPositions.Keys.ToList())
{ {
Vehicle v = key.Entity<Vehicle>(); Vehicle v = key.Entity<Vehicle>();
if (v == null) continue;
if (!v.HasSharedData("drivenDistance")) continue; if (!v.HasSharedData("drivenDistance")) continue;
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(v, dbContext); ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(v, dbContext);
if (sVeh == null) continue; if (sVeh == null) continue;
sVeh.DistanceDriven = (float)v.GetSharedData("drivenDistance"); sVeh.DistanceDriven = (float)v.GetSharedData<dynamic>("drivenDistance");
} }
dbContext.SaveChanges(); dbContext.SaveChanges();

4
ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.Designer.cs generated
View File

@@ -9,8 +9,8 @@ using ReallifeGamemode.Database.Models;
namespace ReallifeGamemode.Database.Migrations namespace ReallifeGamemode.Database.Migrations
{ {
[DbContext(typeof(DatabaseContext))] [DbContext(typeof(DatabaseContext))]
[Migration("20190625202943_ClientWanteds")] [Migration("20190625202943_PlayerWanteds")]
partial class ClientWanteds partial class PlayerWanteds
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {

2
ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.cs
View File

@@ -2,7 +2,7 @@
namespace ReallifeGamemode.Database.Migrations namespace ReallifeGamemode.Database.Migrations
{ {
public partial class ClientWanteds : Migration public partial class PlayerWanteds : Migration
{ {
protected override void Up(MigrationBuilder migrationBuilder) protected override void Up(MigrationBuilder migrationBuilder)
{ {

3
ReallifeGamemode.Server/ReallifeGamemode.Server.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>ReallifeGamemode.Server</RootNamespace> <RootNamespace>ReallifeGamemode.Server</RootNamespace>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -22,6 +22,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.11" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.11" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.11" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.10" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.10" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Properties\" /> <Folder Include="Properties\" />

22
ReallifeGamemode.Server/Report/Report.cs
View File

@@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Report
public static List<ReportManage> listReports = new List<ReportManage>(); public static List<ReportManage> listReports = new List<ReportManage>();
[Command("report", "~m~Benutzung: ~s~/report")] [Command("report", "~m~Benutzung: ~s~/report")]
public void CmdUserReport(Client client) public void CmdUserReport(Player client)
{ {
User user = client.GetUser(); User user = client.GetUser();
@@ -30,7 +30,7 @@ namespace ReallifeGamemode.Server.Report
} }
[Command("showtickets", "~m~Benutzung: ~s~/showtickets")] [Command("showtickets", "~m~Benutzung: ~s~/showtickets")]
public void CmdAdminShowtickets(Client client) public void CmdAdminShowtickets(Player client)
{ {
if (!client.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) if (!client.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
{ {
@@ -68,9 +68,9 @@ namespace ReallifeGamemode.Server.Report
[RemoteEvent("acceptReport")] [RemoteEvent("acceptReport")]
public void AcceptReport(Client admin, string client) public void AcceptReport(Player admin, string playerName)
{ {
Client player = ClientService.GetClientByNameOrId(client); Player player = PlayerService.GetPlayerByNameOrId(playerName);
if (player == null) if (player == null)
return; return;
@@ -103,7 +103,7 @@ namespace ReallifeGamemode.Server.Report
} }
[Command("rc", "~m~Benutzung: ~s~/rc text", GreedyArg = true)] [Command("rc", "~m~Benutzung: ~s~/rc text", GreedyArg = true)]
public void CmdUserRc(Client client, String text) public void CmdUserRc(Player client, String text)
{ {
bool cont = false; bool cont = false;
String username = "N/A"; String username = "N/A";
@@ -124,10 +124,10 @@ namespace ReallifeGamemode.Server.Report
break; break;
} }
} }
Client user = null; Player user = null;
if (cont) if (cont)
{ {
user = ClientService.GetClientByNameOrId(username); user = PlayerService.GetPlayerByNameOrId(username);
if (text.Equals("quit")) if (text.Equals("quit"))
{ {
@@ -174,14 +174,14 @@ namespace ReallifeGamemode.Server.Report
{ {
return; return;
} }
Client admin = ClientService.GetClientByNameOrId(adminname); Player admin = PlayerService.GetPlayerByNameOrId(adminname);
ChatService.SendMessage(admin, "!{#008fff}[REPORT]!{#FFFFFF} " + client.Name + ": " + text); ChatService.SendMessage(admin, "!{#008fff}[REPORT]!{#FFFFFF} " + client.Name + ": " + text);
ChatService.SendMessage(client, "!{#008fff}[REPORT]!{#FFFFFF} " + client.Name + ": " + text); ChatService.SendMessage(client, "!{#008fff}[REPORT]!{#FFFFFF} " + client.Name + ": " + text);
} }
} }
[RemoteEvent("requestReport")] [RemoteEvent("requestReport")]
public void RequestReport(Client user, string type, string data) public void RequestReport(Player user, string type, string data)
{ {
string text = JsonConvert.DeserializeObject<string>(data); string text = JsonConvert.DeserializeObject<string>(data);
if (type == "Ticket Report") if (type == "Ticket Report")
@@ -213,9 +213,9 @@ namespace ReallifeGamemode.Server.Report
} }
[RemoteEvent("deleteReport")] [RemoteEvent("deleteReport")]
public void DeleteReport(Client user, string name) public void DeleteReport(Player user, string name)
{ {
Client player = ClientService.GetClientByNameOrId(name); Player player = PlayerService.GetPlayerByNameOrId(name);
if (player == null) if (player == null)
return; return;

12
ReallifeGamemode.Server/Services/ChatService.cs
View File

@@ -19,22 +19,22 @@ namespace ReallifeGamemode.Server.Services
{ {
class ChatService class ChatService
{ {
public static void NotAuthorized(Client player) public static void NotAuthorized(Player player)
{ {
ChatService.ErrorMessage(player, "Du kannst diesen Befehl nicht ausführen"); ChatService.ErrorMessage(player, "Du kannst diesen Befehl nicht ausführen");
} }
public static void PlayerNotFound(Client player) public static void PlayerNotFound(Player player)
{ {
ChatService.ErrorMessage(player, "Der Spieler wurde nicht gefunden"); ChatService.ErrorMessage(player, "Der Spieler wurde nicht gefunden");
} }
public static void ErrorMessage(Client player, string message) public static void ErrorMessage(Player player, string message)
{ {
ChatService.SendMessage(player, $"~r~[FEHLER]~s~ {message}~s~."); ChatService.SendMessage(player, $"~r~[FEHLER]~s~ {message}~s~.");
} }
public static void SendMessage(Client player, string message) public static void SendMessage(Player player, string message)
{ {
if (player == null) return; if (player == null) return;
player.SendChatMessage(message); player.SendChatMessage(message);
@@ -49,7 +49,7 @@ namespace ReallifeGamemode.Server.Services
/// <param name="factions">Die Liste an Fraktionen, die diese Nachricht bekommen sollen</param> /// <param name="factions">Die Liste an Fraktionen, die diese Nachricht bekommen sollen</param>
public static void BroadcastFaction(string message, List<Faction> factions) public static void BroadcastFaction(string message, List<Faction> factions)
{ {
foreach (Client c in NAPI.Pools.GetAllPlayers()) foreach (Player c in NAPI.Pools.GetAllPlayers())
{ {
Faction f = c.GetUser()?.Faction; Faction f = c.GetUser()?.Faction;
if (f != null) if (f != null)
@@ -94,7 +94,7 @@ namespace ReallifeGamemode.Server.Services
} }
public static void BroadcastDutyAdmin(string message) public static void BroadcastDutyAdmin(string message)
{ {
foreach (Client admin in GlobalHelper.DutyAdmins) foreach (Player admin in GlobalHelper.DutyAdmins)
{ {
ChatService.SendMessage(admin, message); ChatService.SendMessage(admin, message);
} }

2
ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs
View File

@@ -30,7 +30,7 @@ namespace ReallifeGamemode.Server.Shop.Clothing
} }
} }
public void LoadShopNUI(Client client) public void LoadShopNUI(Player client)
{ {
bool gender = client.GetUser().GetCharacter().Gender; bool gender = client.GetUser().GetCharacter().Gender;
List<ShopClothe> tops = clotheList.ToList().FindAll(c => c.Gender == gender && c.ComponentId == 11); List<ShopClothe> tops = clotheList.ToList().FindAll(c => c.Gender == gender && c.ComponentId == 11);

2
ReallifeGamemode.Server/Shop/SevenEleven/ItemShop.cs
View File

@@ -30,7 +30,7 @@ namespace ReallifeGamemode.Server.Shop.SevenEleven
shopItems = dbContext.ShopItems.ToList().FindAll(i => i.ShopId == id); shopItems = dbContext.ShopItems.ToList().FindAll(i => i.ShopId == id);
} }
} }
public void LoadShopNUI(Client client) public void LoadShopNUI(Player client)
{ {
List<ShopItem> itemList = shopItems.ToList().FindAll(s => s.Amount > 0); List<ShopItem> itemList = shopItems.ToList().FindAll(s => s.Amount > 0);
List<IItem> items = new List<IItem>(); List<IItem> items = new List<IItem>();

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

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

@@ -1,17 +1,17 @@
using GTANetworkAPI; using GTANetworkAPI;
namespace ReallifeGamemode.Server.Util namespace ReallifeGamemode.Server.Util
{ {
public class SmoothThrottleAntiReverse : Script public class SmoothThrottleAntiReverse : Script
{ {
[ServerEvent(Event.PlayerExitVehicle)] [ServerEvent(Event.PlayerExitVehicle)]
public void SmoothThrottleExitEvent(Client player, Vehicle veh) public void SmoothThrottleExitEvent(Player player, Vehicle veh)
{ {
NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_PlayerExitVehicle", veh); NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_PlayerExitVehicle", veh);
} }
[ServerEvent(Event.PlayerEnterVehicle)] [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); NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_PlayerEnterVehicle", veh, seat);
} }
@@ -20,19 +20,19 @@ namespace ReallifeGamemode.Server.Util
//Note that these are toggles, you only need to call them once. //Note that these are toggles, you only need to call them once.
//This disables/enables the smooth throttle //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); NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_SetSmoothThrottle", turnedOn);
} }
//This disables/enables anti reverse //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); NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_SetAntiReverse", turnedOn);
} }
//This disables/enables both //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); 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 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.Entity.DoesEntityExist(veh))
{ {
if (NAPI.Data.HasEntitySharedData(veh.Handle, "VehicleSyncData")) if (NAPI.Data.HasEntitySharedData(veh, "VehicleSyncData"))
{ {
try try
{ {
//API converts class objects to JObject so we have to change it back //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>(); return obj.ToObject<VehicleSyncData>();
} }
catch (Exception) { return null; } catch (Exception) { return null; }
@@ -285,7 +285,7 @@ namespace ReallifeGamemode.Server.Util
//Called from the client to sync dirt level //Called from the client to sync dirt level
[RemoteEvent("VehStream_SetDirtLevel")] [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); VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData)) if (data == default(VehicleSyncData))
@@ -301,7 +301,7 @@ namespace ReallifeGamemode.Server.Util
//Called from the client to sync door data //Called from the client to sync door data
[RemoteEvent("VehStream_SetDoorData")] [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); VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData)) if (data == default(VehicleSyncData))
@@ -324,7 +324,7 @@ namespace ReallifeGamemode.Server.Util
//Called from the client to sync window data //Called from the client to sync window data
[RemoteEvent("VehStream_SetWindowData")] [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); VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData)) if (data == default(VehicleSyncData))
@@ -343,7 +343,7 @@ namespace ReallifeGamemode.Server.Util
//Called from the client to sync wheel data //Called from the client to sync wheel data
[RemoteEvent("VehStream_SetWheelData")] [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); VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData)) if (data == default(VehicleSyncData))
@@ -367,7 +367,7 @@ namespace ReallifeGamemode.Server.Util
//Other events //Other events
[ServerEvent(Event.PlayerEnterVehicleAttempt)] [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); VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData)) if (data == default(VehicleSyncData))
@@ -378,10 +378,10 @@ namespace ReallifeGamemode.Server.Util
} }
[ServerEvent(Event.PlayerExitVehicleAttempt)] [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; return;
@@ -397,9 +397,9 @@ namespace ReallifeGamemode.Server.Util
} }
[ServerEvent(Event.PlayerExitVehicle)] [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; return;
VehicleSyncData data = GetVehicleSyncData(veh); VehicleSyncData data = GetVehicleSyncData(veh);
@@ -414,7 +414,7 @@ namespace ReallifeGamemode.Server.Util
} }
[ServerEvent(Event.PlayerEnterVehicle)] [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); VehicleSyncData data = GetVehicleSyncData(veh);
if (data == default(VehicleSyncData)) if (data == default(VehicleSyncData))
@@ -437,7 +437,7 @@ namespace ReallifeGamemode.Server.Util
// UpdateVehicleSyncData(veh, data); // 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); // NAPI.ClientEvent.TriggerClientEvent(NAPI.Vehicle.GetVehicleDriver(veh), "VehStream_PlayerExitVehicleAttempt", veh);
//} //}
@@ -458,12 +458,12 @@ namespace ReallifeGamemode.Server.Util
// INDICATORS // INDICATORS
[RemoteEvent("CLIENT:toggleLeftIndicator")] [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; 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) if (data.Left && data.Right)
{ {
@@ -480,12 +480,12 @@ namespace ReallifeGamemode.Server.Util
} }
[RemoteEvent("CLIENT:toggleRightIndicator")] [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; 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) if (data.Left && data.Right)
{ {
@@ -502,12 +502,12 @@ namespace ReallifeGamemode.Server.Util
} }
[RemoteEvent("CLIENT:toggleWarningIndicator")] [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; 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) if (data.Right && data.Left)
{ {

2
ReallifeGamemode.Server/Wanted/Autowanted.cs
View File

@@ -10,7 +10,7 @@ namespace ReallifeGamemode.Server.Wanted
{ {
public class Autowanted public class Autowanted
{ {
public static void Check_AutoWanted(Client killerPlayer, Client copPlayer) public static void Check_AutoWanted(Player killerPlayer, Player copPlayer)
{ {
User killer = killerPlayer.GetUser(); User killer = killerPlayer.GetUser();
if (killer.FactionId == 1 || killer.FactionId == 3) if (killer.FactionId == 1 || killer.FactionId == 3)

20
ReallifeGamemode.Server/Wanted/Jail.cs
View File

@@ -17,7 +17,7 @@ namespace ReallifeGamemode.Server.Wanted
private static Dictionary<int, int> Jailtime { get; set; } = new Dictionary<int, int>(); //time in seconds private static Dictionary<int, int> Jailtime { get; set; } = new Dictionary<int, int>(); //time in seconds
public static void Check_PutBehindBars(Client client) public static void Check_PutBehindBars(Player client)
{ {
User user = client.GetUser(); User user = client.GetUser();
if (user.JailTime > 0) if (user.JailTime > 0)
@@ -38,17 +38,18 @@ namespace ReallifeGamemode.Server.Wanted
} }
if (user.Wanteds <= 0) if (user.Wanteds <= 0)
return; return;
foreach (var copClient in NAPI.Pools.GetAllPlayers()) foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
{ {
User cop = copClient.GetUser(); if (!copPlayer.IsLoggedIn()) continue;
User cop = copPlayer.GetUser();
if (cop?.FactionId == 1 || cop?.FactionId == 3) if (cop?.FactionId == 1 || cop?.FactionId == 3)
{ {
int jailTime = user.Wanteds * 54; int jailTime = user.Wanteds * 54;
if (cop.GetData<bool>("duty") && copClient.Position.DistanceTo2D(client.Position) <= 200 && (!copClient.HasData("isDead") || copClient.GetData("isDead") != true)) if (cop.GetData<bool>("duty") && copPlayer.Position.DistanceTo2D(client.Position) <= 200 && (!copPlayer.HasData("isDead") || copPlayer.GetData<bool>("isDead") != true))
{ {
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
if (!client.HasData("isDead") || client.GetData("isDead") == false) if (!client.HasData("isDead") || client.GetData<bool>("isDead") == false)
{ {
jailTime /= 2; jailTime /= 2;
} }
@@ -135,8 +136,9 @@ namespace ReallifeGamemode.Server.Wanted
{ {
foreach (var copPlayer in NAPI.Pools.GetAllPlayers()) foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
{ {
if (!copPlayer.IsLoggedIn()) return;
User cop = copPlayer.GetUser(); User cop = copPlayer.GetUser();
if (cop.GetData<bool>("duty") && copPlayer.Position.DistanceTo2D(player.Position) <= 500 && (!copPlayer.HasData("isDead") || copPlayer.GetData("isDead") != true)) if (cop.GetData<bool>("duty") && copPlayer.Position.DistanceTo2D(player.Position) <= 500 && (!copPlayer.HasData("isDead") || copPlayer.GetData<bool>("isDead") != true))
{ {
if (player.Position.DistanceTo2D(new Vector3(458.9842, -997.2126, 24.91485)) <= 7) if (player.Position.DistanceTo2D(new Vector3(458.9842, -997.2126, 24.91485)) <= 7)
{ {
@@ -218,9 +220,9 @@ namespace ReallifeGamemode.Server.Wanted
} }
[RemoteEvent("setPrisonerFree")] [RemoteEvent("setPrisonerFree")]
public void Release_Jail(Client cop, string client) public void Release_Jail(Player cop, string client)
{ {
Client player = ClientService.GetClientByNameOrId(client); Player player = PlayerService.GetPlayerByNameOrId(client);
if (player == null) if (player == null)
return; return;
@@ -243,7 +245,7 @@ namespace ReallifeGamemode.Server.Wanted
} }
} }
public static void Release_Jail_Admin(Client admin, Client target) public static void Release_Jail_Admin(Player admin, Player target)
{ {
User user = target.GetUser(); User user = target.GetUser();
if (Jailtime.ContainsKey(user.Id)) if (Jailtime.ContainsKey(user.Id))

4
ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs
View File

@@ -28,7 +28,7 @@ namespace ReallifeGamemode.Server.Wanted
timer.Elapsed += Timer_Elapsed; timer.Elapsed += Timer_Elapsed;
} }
public static void ResetWantedTimeToElapse(Client client) public static void ResetWantedTimeToElapse(Player client)
{ {
User user = client.GetUser(); User user = client.GetUser();
if (user.FactionId == 1 || user.FactionId == 3) if (user.FactionId == 1 || user.FactionId == 3)
@@ -50,6 +50,8 @@ namespace ReallifeGamemode.Server.Wanted
bool isNearCop = false; bool isNearCop = false;
foreach (var playerCop in NAPI.Pools.GetAllPlayers()) foreach (var playerCop in NAPI.Pools.GetAllPlayers())
{ {
if (!playerCop.IsLoggedIn()) continue;
User cop = playerCop.GetUser(); User cop = playerCop.GetUser();
if (cop != null && (cop.FactionId == 1 || cop.FactionId == 3)) if (cop != null && (cop.FactionId == 1 || cop.FactionId == 3))
{ {

6
ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
View File

@@ -16,14 +16,14 @@ namespace ReallifeGamemode.Server.WeaponDeal
{ {
public static bool checkWeaponDbyVehicle(Vehicle vehicle) public static bool checkWeaponDbyVehicle(Vehicle vehicle)
{ {
if (!vehicle.HasData("WeaponDealLoad") || vehicle.GetData("WeaponDealLoad") == false) if (!vehicle.HasData("WeaponDealLoad") || vehicle.GetData<bool>("WeaponDealLoad") == false)
return false; return false;
return true; return true;
} }
[RemoteEvent("startWeaponDeal")] [RemoteEvent("startWeaponDeal")]
public void SrvEVENT_startWeaponDeal(Client client) public void SrvEVENT_startWeaponDeal(Player client)
{ {
var user = client.GetUser(); var user = client.GetUser();
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
@@ -77,7 +77,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
[RemoteEvent("loadWeaponTransport")] [RemoteEvent("loadWeaponTransport")]
public void SrvEVENT_loadWeaponTransport(Client client) public void SrvEVENT_loadWeaponTransport(Player client)
{ {
if ((VehicleHash)client.Vehicle.Model != VehicleHash.Burrito3) if ((VehicleHash)client.Vehicle.Model != VehicleHash.Burrito3)
return; return;

2
ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs
View File

@@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
public static Vector3 getRndWD_Route(int factionID) public static Vector3 getRndWD_Route(int factionID)
{ {
if (!factionWeaponDeal.ContainsKey(factionID)) if (!factionWeaponDeal.ContainsKey(factionID))
return null; return new Vector3();
if (factionWeaponDeal[factionID] == -1) if (factionWeaponDeal[factionID] == -1)
{ {

8
ReallifeGamemode.Services/ClientService.cs → ReallifeGamemode.Services/PlayerService.cs
View File

@@ -11,19 +11,19 @@ using System.Text;
namespace ReallifeGamemode.Services namespace ReallifeGamemode.Services
{ {
public class ClientService public class PlayerService
{ {
/// <summary> /// <summary>
/// Gibt einen Client anhand seines Namens oder der ID zurück /// Gibt einen Client anhand seines Namens oder der ID zurück
/// </summary> /// </summary>
/// <param name="nameOrId">Die ID oder der Name, nach dem gesucht werden soll</param> /// <param name="nameOrId">Die ID oder der Name, nach dem gesucht werden soll</param>
/// <returns></returns> /// <returns></returns>
public static Client GetClientByNameOrId(string nameOrId) public static Player GetPlayerByNameOrId(string nameOrId)
{ {
Client toReturn = null; Player toReturn = null;
nameOrId = nameOrId.ToLower(); nameOrId = nameOrId.ToLower();
List<Client> playerList = NAPI.Pools.GetAllPlayers(); List<Player> playerList = NAPI.Pools.GetAllPlayers();
if (int.TryParse(nameOrId, out int id)) if (int.TryParse(nameOrId, out int id))
{ {

2
ReallifeGamemode.Services/ReallifeGamemode.Services.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<Configurations>Debug;Release;ServerBuild</Configurations> <Configurations>Debug;Release;ServerBuild</Configurations>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<Platforms>AnyCPU;x64</Platforms> <Platforms>AnyCPU;x64</Platforms>

4
postbuild.ps1
View File

@@ -20,8 +20,8 @@ Set-Variable sourceIndexJsPath -option Constant -value "$PSScriptRoot\ReallifeGa
Set-Variable sourceDlcPacksPath -option Constant -value "$PSScriptRoot\ReallifeGamemode.Client\dlcpacks" Set-Variable sourceDlcPacksPath -option Constant -value "$PSScriptRoot\ReallifeGamemode.Client\dlcpacks"
# set constant dirs # set constant dirs
Set-Variable runtimeDir -option Constant -value "bridge\runtime" Set-Variable runtimeDir -option Constant -value "dotnet\runtime"
Set-Variable resourcesDir -option Constant -value "bridge\resources" Set-Variable resourcesDir -option Constant -value "dotnet\resources"
Set-Variable gamemodeDir -option Constant -value "reallife-gamemode" Set-Variable gamemodeDir -option Constant -value "reallife-gamemode"
Set-Variable assetsDir -option Constant -value "client_packages\assets" Set-Variable assetsDir -option Constant -value "client_packages\assets"
Set-Variable indexJsDir -option Constant -value "client_packages" Set-Variable indexJsDir -option Constant -value "client_packages"