diff --git a/Import/Bootstrapper.dll b/Import/Bootstrapper.dll index 89c40461..bf4c5b72 100644 Binary files a/Import/Bootstrapper.dll and b/Import/Bootstrapper.dll differ diff --git a/Import/Bootstrapper.xml b/Import/Bootstrapper.xml new file mode 100644 index 00000000..9a43d2a5 --- /dev/null +++ b/Import/Bootstrapper.xml @@ -0,0 +1,224 @@ + + + + Bootstrapper + + + + + Used to cancel events. + + + + + Event has no parameters. + + + + + Event has no parameters. + + + + + Event Params: resourceName + + + + + Event Params: resourceName + + + + + Event Params: mapName, map + + + + + Event Params: client, message + + + + + Event has no parameters. + + + + + Event Params: entity + + + + + Event Params: entity + + + + + Event Params: entity, oldModel + + + + + Event Params: client + + + + + Event Params: ip, serial, rgscName, rgscId, cancel + + + + + Event Params: client + + + + + Event Params: client + + + + + Event Params: client, killer, reason + Death reason can be of either or + + + + + Event Params: client, healthLoss, armorLoss + + + + + Event Params: client, pickup + + + + + Event Params: client, oldWeaponHash, newWeaponHash + + + + + Event Params: client + + + + + Event Params: checkpoint, client + + + + + Event Params: checkpoint, client + + + + + Event Params: colShape, client + + + + + Event Params: colShape, client + + + + + Event Params: client, vehicle, seatID + + + + + Event Params: client, vehicle + + + + + Event Params: client, vehicle, seatID + + + + + Event Params: client, vehicle + + + + + Event Params: vehicle, bodyHealthLoss, engineHealthLoss + + + + + Event Params: vehicle + + + + + Event Params: vehicle + + + + + Event Params: vehicle, oldValue + + + + + Event Params: vehicle, index + + + + + Event Params: vehicle, index + + + + + Event Params: vehicle, index + + + + + Event Params: vehicle, trailer + + + + + Occurs when an exception is thrown in managed code, before the runtime searches + the call stack for an exception handler in the application domain. + Event Params: exception + + + + + Occurs when an exception is not caught. + Event Params: exception + + + + + An invalid event for internal usage + + + + public static bool operator ==(Entity left, Entity right) => left?.Value == right?.Value; + public static bool operator !=(Entity left, Entity right) => left?.Value != right?.Value; + + + GTANetworkInternals.RemoteEventResponseHandler.Push((int)player.Value, requestId, callback.Method, callback.Target); + + + void SetPlayerDefaultClothes(Client player); + + + + Runs thread-safe API code on main thread. + + + should be in ms (milliseconds) + + + diff --git a/Import/bridge.dll b/Import/bridge.dll backup similarity index 100% rename from Import/bridge.dll rename to Import/bridge.dll backup diff --git a/Import/rage-sharp.dll backup b/Import/rage-sharp.dll backup new file mode 100644 index 00000000..0df5654d Binary files /dev/null and b/Import/rage-sharp.dll backup differ diff --git a/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj b/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj index 26796e24..91c06d1d 100644 --- a/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj +++ b/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj @@ -1,10 +1,11 @@  - netcoreapp2.0 + netcoreapp3.1 true true true + true AnyCPU;x64 @@ -27,6 +28,10 @@ + + + + diff --git a/ReallifeGamemode.Database/Entities/House.cs b/ReallifeGamemode.Database/Entities/House.cs index 66be0e21..3ff7ed7a 100644 --- a/ReallifeGamemode.Database/Entities/House.cs +++ b/ReallifeGamemode.Database/Entities/House.cs @@ -30,6 +30,6 @@ namespace ReallifeGamemode.Database.Entities public User Owner { get; set; } [NotMapped] - public Client User => Owner?.Client; + public Player User => Owner?.Player; } } diff --git a/ReallifeGamemode.Database/Entities/User.cs b/ReallifeGamemode.Database/Entities/User.cs index ce15c4d5..d4570709 100644 --- a/ReallifeGamemode.Database/Entities/User.cs +++ b/ReallifeGamemode.Database/Entities/User.cs @@ -77,7 +77,7 @@ namespace ReallifeGamemode.Database.Entities set { this._wanteds = value; - Client.TriggerEvent("SERVER:SetWanteds", value); + Player.TriggerEvent("SERVER:SetWanteds", value); } } @@ -111,7 +111,7 @@ namespace ReallifeGamemode.Database.Entities } [NotMapped] - public Client Client + public Player Player { get => NAPI.Pools.GetAllPlayers().Where(c => c.Name.ToLower() == this.Name.ToLower()).FirstOrDefault(); } diff --git a/ReallifeGamemode.Database/Entities/UserBankAccount.cs b/ReallifeGamemode.Database/Entities/UserBankAccount.cs index 7d6c0b8d..c07c1a92 100644 --- a/ReallifeGamemode.Database/Entities/UserBankAccount.cs +++ b/ReallifeGamemode.Database/Entities/UserBankAccount.cs @@ -35,7 +35,7 @@ namespace ReallifeGamemode.Database.Entities _balance = value; 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); } } } diff --git a/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj b/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj index ffb29e5c..9d3eb1cc 100644 --- a/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj +++ b/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp3.1 AnyCPU;x64 diff --git a/ReallifeGamemode.Server/Business/BusinessBase.cs b/ReallifeGamemode.Server/Business/BusinessBase.cs index f6d5ec68..7febf83d 100644 --- a/ReallifeGamemode.Server/Business/BusinessBase.cs +++ b/ReallifeGamemode.Server/Business/BusinessBase.cs @@ -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); } @@ -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; client.TriggerEvent("SERVER:Business_ShowMenuHelp"); - SendBusinessDataToClient(client); + SendBusinessDataToPlayer(client); } - public void SendBusinessDataToClient(Client player) + public void SendBusinessDataToPlayer(Player player) { User owner = GetOwner(); diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index d37d67b6..f4096dfd 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -34,7 +34,7 @@ namespace ReallifeGamemode.Server.Commands #region Todo [Command("eat", "~m~Benutzung: ~s~/eat [Item]")] - public void CmdAdminEat(Client player, string item) + public void CmdAdminEat(Player player, string item) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -66,7 +66,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("myvehicles")] - public void CmdAdminMyVehicles(Client player) + public void CmdAdminMyVehicles(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -90,7 +90,7 @@ namespace ReallifeGamemode.Server.Commands //TODO [Command("fpay")] - public void FPay(Client player, string receiver, int amount) + public void FPay(Player player, string receiver, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -112,13 +112,13 @@ namespace ReallifeGamemode.Server.Commands } [Command("saveall")] - public void SaveAll(Client player) + public void SaveAll(Player player) { SaveManager.SaveAllOnSave(); } [Command("hash")] - public void CmdHash(Client player, string toHash) + public void CmdHash(Player player, string toHash) { string msg = $"{toHash} => {NAPI.Util.GetHashKey(toHash)}"; NAPI.Util.ConsoleOutput(msg); @@ -128,7 +128,7 @@ namespace ReallifeGamemode.Server.Commands #endregion #region ahelp [Command("ahelp", "~m~Benutzung: ~s~/ahelp")] - public void CmdAdminHelp(Client player) + public void CmdAdminHelp(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.MAPPING) ?? true) { @@ -175,7 +175,7 @@ namespace ReallifeGamemode.Server.Commands #region Mapping / Entwicklung [Command("team", "~m~Benutzung: ~s~/team")] - public void CmdAdminTeam(Client player) + public void CmdAdminTeam(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.MAPPING) ?? true) { @@ -185,15 +185,15 @@ namespace ReallifeGamemode.Server.Commands ChatService.SendMessage(player, "Online Teammitglieder:"); - List playerlist = NAPI.Pools.GetAllPlayers().FindAll(c => c.GetUser()?.IsAdmin(AdminLevel.MAPPING) ?? false).OrderByDescending(c => c.GetUser().AdminLevel).ToList(); - foreach (Client currentPlayer in playerlist) + List playerlist = NAPI.Pools.GetAllPlayers().FindAll(c => c.GetUser()?.IsAdmin(AdminLevel.MAPPING) ?? false).OrderByDescending(c => c.GetUser().AdminLevel).ToList(); + foreach (Player currentPlayer in playerlist) { ChatService.SendMessage(player, currentPlayer.GetUser().AdminLevel.GetName() + " | " + currentPlayer.Name + " | ID: " + currentPlayer.Handle.Value); } } [Command("tc", "~m~Benutzung: ~s~/tc [Nachricht]", GreedyArg = true)] - public void CmdTeamC(Client player, string message) + public void CmdTeamC(Player player, string message) { if (!player.GetUser()?.IsAdmin(AdminLevel.MAPPING) ?? true) { @@ -207,7 +207,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("position", "~m~Benutzung: ~s~/position")] - public void CmdAdminPosition(Client player) + public void CmdAdminPosition(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -222,7 +222,7 @@ namespace ReallifeGamemode.Server.Commands #endregion #region Support [Command("tsupport", "~m~Benutzung: ~s~/tsupport", Alias = "ts")] - public void tsup(Client player) + public void tsup(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -266,7 +266,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("aduty", "~m~Benutzung: ~s~/aduty")] - public void CmdAduty(Client player) + public void CmdAduty(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -293,7 +293,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)] - public void CmdAdminO(Client player, string message) + public void CmdAdminO(Player player, string message) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -308,7 +308,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("dimension", "~m~Benutzung: ~s~/dimension")] - public void CmdAdminDimension(Client player) + public void CmdAdminDimension(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -319,7 +319,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("to", "~m~Benutzung: ~s~/to [Name]")] - public void CmdAdminGoto(Client player, string name) + public void CmdAdminGoto(Player player, string name) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -327,7 +327,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { @@ -335,7 +335,7 @@ namespace ReallifeGamemode.Server.Commands return; } //TODO: Als Supporter nur, wenn mit dem Ziel ein offenes Ticket besteht. Ansonsten kein Teleport - if (player.IsInVehicle && player.VehicleSeat == -1) + if (player.IsInVehicle && player.VehicleSeat == 0) { player.Vehicle.Position = target.Position; NAPI.Entity.SetEntityVelocity(player.Vehicle, new Vector3()); @@ -345,7 +345,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("gh", "~m~Benutzung: ~s~/gh [Name]")] - public void CmdAdminGethere(Client player, string name) + public void CmdAdminGethere(Player player, string name) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -353,7 +353,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { @@ -371,7 +371,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("pm", "~m~Benutzung: ~s~/pm [Spieler] [Nachricht]", GreedyArg = true)] - public void CmdAdminMsg(Client player, string name, string msg) + public void CmdAdminMsg(Player player, string name, string msg) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -379,7 +379,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -400,7 +400,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("skick", "~m~Benutzung: ~s~/skick [Player] [Grund]", GreedyArg = true)] - public void CmdAdminSKick(Client player, string targetname, string reason) + public void CmdAdminSKick(Player player, string targetname, string reason) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -408,7 +408,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(targetname); + Player target = PlayerService.GetPlayerByNameOrId(targetname); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -425,7 +425,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("clearchat", "~m~Benutzung: ~s~/clearchat")] - public void CmdAdminClearchat(Client player) + public void CmdAdminClearchat(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -444,7 +444,7 @@ namespace ReallifeGamemode.Server.Commands #region ALevel1 [Command("countdown", "~m~Benutzung: ~s~/countdown [Zeit] [Text]", GreedyArg = true)] - public void CmdAdminCountdown(Client player, string timer_string, string text) + public void CmdAdminCountdown(Player player, string timer_string, string text) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -454,7 +454,7 @@ namespace ReallifeGamemode.Server.Commands if (timer_string == "clear") { - foreach (Client c in NAPI.Pools.GetAllPlayers()) + foreach (Player c in NAPI.Pools.GetAllPlayers()) { c.TriggerEvent("countdown", 0, ""); } @@ -471,7 +471,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("a", "~m~Benutzung: ~s~/a [Nachricht]", GreedyArg = true)] - public void CmdAdminA(Client player, string message) + public void CmdAdminA(Player player, string message) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -484,48 +484,11 @@ namespace ReallifeGamemode.Server.Commands ChatService.BroadcastAdmin("!{#1db992}** AC " + player.Name + ":~w~ " + message, AdminLevel.ADMIN); } - [Command("freeze", "~m~Benutzung: ~s~/freeze [Spieler]")] - public void CmdAdminFreeze(Client player, string targetname) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - Client target = ClientService.GetClientByNameOrId(targetname); - if (target == null || !target.IsLoggedIn()) - { - ChatService.PlayerNotFound(player); - return; - } - ChatService.SendMessage(player, "Du hast ~y~" + target.Name + " ~s~gefreezed."); - ChatService.SendMessage(target, "Du wurdest von ~y~" + player.Name + "~s~ gefreezed."); - target.Freeze(true); - } - - [Command("unfreeze", "~m~Benutzung: ~s~/unfreeze [Spieler]")] - public void CmdAdminUnfreeze(Client player, string targetname) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - - Client target = ClientService.GetClientByNameOrId(targetname); - if (target == null || !target.IsLoggedIn()) - { - ChatService.PlayerNotFound(player); - return; - } - ChatService.SendMessage(player, "Du hast ~y~" + target.Name + " ~s~unfreezed."); - ChatService.SendMessage(target, "Du wurdest von ~y~" + player.Name + "~s~ unfreezed."); - target.Freeze(false); - } + [Command("gotolist", "~m~Benutzung: ~s~/gotolist")] //TODO Als Browser anzeigeN?? - public void CmdAdminGotoList(Client player) + public void CmdAdminGotoList(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -547,7 +510,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("mark", "~m~Benutzung: ~s~/mark")] - public void CmdAdminMark(Client player) + public void CmdAdminMark(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -559,7 +522,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("gotomark", "~m~Benutzung: ~s~/gotomark")] - public void CmdAdminGotoMark(Client player) + public void CmdAdminGotoMark(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -573,12 +536,12 @@ namespace ReallifeGamemode.Server.Commands return; } - if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = player.GetData("mark"); - else player.Position = player.GetData("mark"); + if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = player.GetData("mark"); + else player.Position = player.GetData("mark"); } [Command("up", "~m~Benutzung: ~s~/up [Wert]")] - public void CmdAdminUp(Client player, int value = 5) + public void CmdAdminUp(Player player, int value = 5) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -597,7 +560,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("dn", "~m~Benutzung: ~s~/dn [Wert]")] - public void CmdAdminDn(Client player, int value = 5) + public void CmdAdminDn(Player player, int value = 5) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -616,7 +579,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("rt", "~m~Benutzung: ~s~/rt [Wert]")] - public void CmdAdminRt(Client player, int value = 5) + public void CmdAdminRt(Player player, int value = 5) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -629,31 +592,31 @@ namespace ReallifeGamemode.Server.Commands if (playerHeading < 45 || playerHeading >= 315) { Vector3 playerPosition = new Vector3(player.Position.X + value, player.Position.Y, player.Position.Z); - if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition; else player.Position = playerPosition; } else if (playerHeading < 315 && playerHeading >= 225) { Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z); - if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition; else player.Position = playerPosition; } else if (playerHeading >= 135 && playerHeading < 225) { Vector3 playerPosition = new Vector3(player.Position.X - value, player.Position.Y, player.Position.Z); - if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition; else player.Position = playerPosition; } else if (playerHeading >= 45 && playerHeading < 135) { Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y + value, player.Position.Z); - if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition; else player.Position = playerPosition; } } [Command("lt", "~m~Benutzung: ~s~/lt [Wert]")] - public void CmdAdminLt(Client player, int value = 5) + public void CmdAdminLt(Player player, int value = 5) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -666,31 +629,31 @@ namespace ReallifeGamemode.Server.Commands if (playerHeading < 45 || playerHeading >= 315) { Vector3 playerPosition = new Vector3(player.Position.X - value, player.Position.Y, player.Position.Z); - if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition; else player.Position = playerPosition; } else if (playerHeading < 315 && playerHeading >= 225) { Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y + value, player.Position.Z); - if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition; else player.Position = playerPosition; } else if (playerHeading >= 135 && playerHeading < 225) { Vector3 playerPosition = new Vector3(player.Position.X + value, player.Position.Y, player.Position.Z); - if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition; else player.Position = playerPosition; } else if (playerHeading >= 45 && playerHeading < 135) { Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z); - if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = playerPosition; + if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition; else player.Position = playerPosition; } } [Command("setdimension", "~m~Benutzung: ~s~/setdimension [Spieler] [Dimension]")] - public void CmdAdminSetDimension(Client player, string targetname, uint dimension) + public void CmdAdminSetDimension(Player player, string targetname, uint dimension) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -698,7 +661,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(targetname); + Player target = PlayerService.GetPlayerByNameOrId(targetname); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -710,7 +673,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("kick", "~m~Benutzung: ~s~/kick [Player] [Grund]", GreedyArg = true)] - public void CmdAdminKick(Client player, string targetname, string reason) + public void CmdAdminKick(Player player, string targetname, string reason) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -718,7 +681,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(targetname); + Player target = PlayerService.GetPlayerByNameOrId(targetname); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -735,7 +698,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("ip", "~m~Benutzung: ~s~/ip [Spieler]")] - public void CmdAdminIp(Client player, string targetname) + public void CmdAdminIp(Player player, string targetname) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -743,7 +706,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(targetname); + Player target = PlayerService.GetPlayerByNameOrId(targetname); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -753,7 +716,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("ban", "~m~Benutzung: ~s~/ban [User] [Zeit in Minuten(0 für Permanent)] [Grund] ", GreedyArg = true)] - public void CmdAdminBan(Client admin, string user, int mins, string reason) + public void CmdAdminBan(Player admin, string user, int mins, string reason) { if (!admin.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -761,7 +724,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(user); + Player target = PlayerService.GetPlayerByNameOrId(user); if (target == null || !target.IsLoggedIn()) { @@ -775,7 +738,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("unban", "~m~Benutzung: ~s~/unban [Name] ")] - public void CmdAdminUnban(Client admin, string userName) + public void CmdAdminUnban(Player admin, string userName) { if (!admin.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -828,7 +791,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("goto", "~m~Benutzung: ~s~/goto [Ort]")] - public void CmdAdminGotoPoint(Client player, string location) + public void CmdAdminGotoPoint(Player player, string location) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -845,61 +808,27 @@ namespace ReallifeGamemode.Server.Commands return; } - if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = new Vector3(p.X, p.Y, p.Z); + if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = new Vector3(p.X, p.Y, p.Z); else player.Position = new Vector3(p.X, p.Y, p.Z); } } [Command("gotox", "~m~Benutzung: ~s~/gotox [X] [Y] [Z]")] - public void CmdAdminGotoxyz(Client player, float x, float y, float z) + public void CmdAdminGotoxyz(Player player, float x, float y, float z) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; } - if (player.IsInVehicle && player.VehicleSeat == -1) player.Vehicle.Position = new Vector3(x, y, z); + if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = new Vector3(x, y, z); else player.Position = new Vector3(x, y, z); } - [Command("spec", "~m~Benutzung: ~s~/spec [Player]")] - public void CmdAdminSpectate(Client player, string name) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - Client target = ClientService.GetClientByNameOrId(name); - if (target == null || !target.IsLoggedIn()) - { - ChatService.PlayerNotFound(player); - return; - } - if (target == player) - { - ChatService.ErrorMessage(player, "Du kannst dich nicht selber spectaten"); - return; - } - - bool spec = player.GetData("spec"); - - if (spec == false) - { - NAPI.Player.SetPlayerToSpectatePlayer(player, target); - player.SetData("spec", true); - } - else - { - NAPI.Player.UnspectatePlayer(player); - player.SetData("spec", false); - } - - } - + [Command("slap", "~m~Benutzung: ~s~/slap [Spieler] (Höhe)")] - public void CmdAdminSlap(Client player, string name, int wert = 5) + public void CmdAdminSlap(Player player, string name, int wert = 5) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -907,7 +836,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -921,14 +850,14 @@ namespace ReallifeGamemode.Server.Commands } [Command("takeweapon", "~m~Benutzung: ~s~/takeweapon [Spieler]")] - public void CmdAdminTakeWeapon(Client player, string name) + public void CmdAdminTakeWeapon(Player player, string name) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -940,7 +869,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("tov", "~m~Benutzung: ~s~/tov [Fahrzeug ID]")] - public void CmdAdminTov(Client player, int vehid) + public void CmdAdminTov(Player player, int vehid) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -959,7 +888,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("ghv", "~m~Benutzung: ~s~/ghv [Fahrzeug ID]")] - public void CmdAdminGhv(Client player, int vehid) + public void CmdAdminGhv(Player player, int vehid) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -979,7 +908,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("factionlist", "~m~Benutzung: ~s~/factionlist")] - public void CmdAdminFactionlist(Client player) + public void CmdAdminFactionlist(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -998,7 +927,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("businesslist", "~m~Benutzung: ~s~/businesslist")] - public void CmdAdminBusinessList(Client player) + public void CmdAdminBusinessList(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -1014,7 +943,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("joblist", "~m~Benutzung: ~s~/joblist")] - public void CmdAdminJoblist(Client player) + public void CmdAdminJoblist(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { @@ -1032,7 +961,7 @@ namespace ReallifeGamemode.Server.Commands #endregion #region ALevel2 [Command("sethp", "~m~Benutzung: ~s~/sethp [Spieler] (Hp)")] - public void CmdAdminSetHp(Client player, string name, int hp = 100) + public void CmdAdminSetHp(Player player, string name, int hp = 100) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) { @@ -1040,7 +969,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -1053,7 +982,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("clothes", "~m~Benutzung: ~s~/clothes [Spieler] [Component ID] [Drawable] (Textur)")] - public void CmdAdminClothes(Client player, string name, int component, int drawable, int texture = 0) + public void CmdAdminClothes(Player player, string name, int component, int drawable, int texture = 0) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) { @@ -1061,7 +990,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -1097,7 +1026,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("props", "~m~Benutzung: ~s~/props [Spieler] [Component ID] [Drawable] (Textur)")] - public void CmdAdminProps(Client player, string name, int slot, int component, int texture = 0) + public void CmdAdminProps(Player player, string name, int slot, int component, int texture = 0) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) { @@ -1105,7 +1034,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -1121,9 +1050,9 @@ namespace ReallifeGamemode.Server.Commands } [Command("aunjail", "~m~Benutzung: ~s~/aunjail [Spieler]", GreedyArg = true)] - public void CmdAdminAunjai(Client player, string targetname) + public void CmdAdminAunjai(Player player, string targetname) { - Client target = ClientService.GetClientByNameOrId(targetname); + Player target = PlayerService.GetPlayerByNameOrId(targetname); if (target == null) return; @@ -1137,7 +1066,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("arevive", "~m~Benutzung: ~s~/arevive [Spieler]")] - public void CmdAdminRevive(Client player, string name) + public void CmdAdminRevive(Player player, string name) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) { @@ -1145,7 +1074,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -1167,7 +1096,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setarmor", "~m~Benutzung: ~s~/setarmor [Spieler] (Armor)")] - public void CmdAdminSetArmor(Client player, string name, int armor = 100) + public void CmdAdminSetArmor(Player player, string name, int armor = 100) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) { @@ -1175,7 +1104,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -1188,7 +1117,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("aclear", "~m~Benutzung: ~s~/aclear [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(); @@ -1198,7 +1127,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(nameOrId); + Player target = PlayerService.GetPlayerByNameOrId(nameOrId); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -1240,7 +1169,7 @@ namespace ReallifeGamemode.Server.Commands #region ALevel3 [Command("adice", "~m~Benutzung: ~s~/adice [Zahl]")] - public void CmdUserAdice(Client player, int number) + public void CmdUserAdice(Player player, int number) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1252,15 +1181,15 @@ namespace ReallifeGamemode.Server.Commands var peopleInRange = NAPI.Player.GetPlayersInRadiusOfPlayer(7, player); - foreach (var managedClient in peopleInRange) + foreach (var managedPlayer in peopleInRange) { - if (!managedClient.IsLoggedIn()) return; - ChatService.SendMessage(managedClient, "* " + player.Name + " hat eine " + number + " gewürfelt."); + if (!managedPlayer.IsLoggedIn()) return; + ChatService.SendMessage(managedPlayer, "* " + player.Name + " hat eine " + number + " gewürfelt."); } } [Command("veh", "~m~Benutzung: ~s~/veh [Fahrzeug] (Farbe 1) (Farbe 2)")] - public void CmdAdminVeh(Client player, string hash, int color1 = 111, int color2 = 111) + public void CmdAdminVeh(Player player, string hash, int color1 = 111, int color2 = 111) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) //TODO: Bestimmte Autos nur ab Adminlevel 1337, "normale Fahrzeuge" schon ab Adminlevel 3. @@ -1291,7 +1220,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("fv", "~m~Benutzung: ~s~/fv", Alias = "vfix")] - public void CmdAdminFixveh(Client player) + public void CmdAdminFixveh(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1309,7 +1238,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("vdestroy", "~m~Benutzung: ~s~/vdestroy (ID)")] - public void CmdAdminVdestroy(Client player, int vid = -1) + public void CmdAdminVdestroy(Player player, int vid = -1) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1350,7 +1279,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("vlivery", "~m~Benutzung: ~s~/vlivery [Livery]")] - public void CmdAdminVlivery(Client player, int livery) + public void CmdAdminVlivery(Player player, int livery) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1370,7 +1299,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("vcolor", "~m~Benutzung: ~s~/vcolor [Farb-ID1] [Farb-ID2]")] - public void CmdAdminColor(Client player, int color1, int color2) + public void CmdAdminColor(Player player, int color1, int color2) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1390,7 +1319,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("giveweapon", "~m~Benutzung: ~s~/giveweapon [Spieler] [Waffe] [Munition]")] - public void CmdAdminGiveweapon(Client player, string name, string hash, int ammo) + public void CmdAdminGiveweapon(Player player, string name, string hash, int ammo) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1406,7 +1335,7 @@ namespace ReallifeGamemode.Server.Commands hash = hash.ToLower(); - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -1431,7 +1360,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("vmod", "~m~Benutzung: ~s~/vmod [Slot] [Mod ID]")] - public void CmdAdminVmod(Client player, int slot, int mod) + public void CmdAdminVmod(Player player, int slot, int mod) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1449,7 +1378,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("aneon", "~m~Benutzung: ~s~/aneon [R][G][B]")] - public void CmdAdminNeon(Client player, int r, int g, int b) + public void CmdAdminNeon(Player player, int r, int g, int b) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1469,7 +1398,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("vehsmoke", "~m~Benutzung: ~s~/vehsmoke [R][G][B]")] - public void CmdAdminVehSmoke(Client player, int r, int g, int b) + public void CmdAdminVehSmoke(Player player, int r, int g, int b) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1488,7 +1417,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("rsethp", "~m~Benutzung: ~s~/rsethp [Radius] (Leben)")] - public void CmdAdminRangeSetHP(Client player, float radius, int hp = 100) + public void CmdAdminRangeSetHP(Player player, float radius, int hp = 100) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1497,17 +1426,17 @@ namespace ReallifeGamemode.Server.Commands } var peopleInRange = NAPI.Player.GetPlayersInRadiusOfPlayer(radius, player); - foreach (var managedClient in peopleInRange) + foreach (var managedPlayer in peopleInRange) { - if (!managedClient.IsLoggedIn()) return; - managedClient.Health = hp; - ChatService.SendMessage(managedClient, "~b~Admin " + player.Name + " hat im Radius von " + radius + " die HP auf " + hp + " gesetzt."); + if (!managedPlayer.IsLoggedIn()) return; + managedPlayer.Health = hp; + ChatService.SendMessage(managedPlayer, "~b~Admin " + player.Name + " hat im Radius von " + radius + " die HP auf " + hp + " gesetzt."); } ChatService.SendMessage(player, "~b~Das Leben von " + peopleInRange.Count + " Spielern wurde auf " + hp + " gesetzt."); } [Command("rsetarmor", "~m~Benutzung: ~s~/rsetarmor [Radius] (Armor)")] - public void CmdAdminRangeSetArmor(Client player, float radius, int Armor = 100) + public void CmdAdminRangeSetArmor(Player player, float radius, int Armor = 100) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1516,17 +1445,17 @@ namespace ReallifeGamemode.Server.Commands } var peopleInRange = NAPI.Player.GetPlayersInRadiusOfPlayer(radius, player); - foreach (var managedClient in peopleInRange) + foreach (var managedPlayer in peopleInRange) { - if (!managedClient.IsLoggedIn()) return; - managedClient.Armor = Armor; - ChatService.SendMessage(managedClient, "~b~Admin " + player.Name + " hat im Radius von " + radius + " die Rüstung auf " + Armor + " gesetzt."); + if (!managedPlayer.IsLoggedIn()) return; + managedPlayer.Armor = Armor; + ChatService.SendMessage(managedPlayer, "~b~Admin " + player.Name + " hat im Radius von " + radius + " die Rüstung auf " + Armor + " gesetzt."); } ChatService.SendMessage(player, "~b~Die Rüstung von " + peopleInRange.Count + " Spielern wurde auf " + Armor + " gesetzt."); } [Command("rgiveweapon", "~m~Benutzung: ~s~/rgiveweapon [Radius] [Waffe] [Munition]")] - public void CmdAdminRangeGiveWeapon(Client player, float radius, string weapon, int munition) + public void CmdAdminRangeGiveWeapon(Player player, float radius, string weapon, int munition) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1552,17 +1481,17 @@ namespace ReallifeGamemode.Server.Commands var peopleInRange = NAPI.Player.GetPlayersInRadiusOfPlayer(radius, player); - foreach (var managedClient in peopleInRange) + foreach (var managedPlayer in peopleInRange) { - if (!managedClient.IsLoggedIn()) return; - managedClient.GiveWeapon(weaponHash, munition); - ChatService.SendMessage(managedClient, "~b~Admin " + player.Name + " hat im Radius von " + radius + " eine/n " + weapon + " mit " + munition + " Munition vergeben."); + if (!managedPlayer.IsLoggedIn()) return; + managedPlayer.GiveWeapon(weaponHash, munition); + ChatService.SendMessage(managedPlayer, "~b~Admin " + player.Name + " hat im Radius von " + radius + " eine/n " + weapon + " mit " + munition + " Munition vergeben."); } ChatService.SendMessage(player, "~b~Du hast " + peopleInRange.Count + " Spielern eine " + weapon + " mit " + munition + " Munition gegeben"); } [Command("settime", "~m~Benutzung: ~s~/settime [Stunde] (Minuten) (Sekunden)")] - public void CmdAdminSetTime(Client player, int hour, int min = 0, int sec = 0) + public void CmdAdminSetTime(Player player, int hour, int min = 0, int sec = 0) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1591,7 +1520,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setweather", "~m~Benutzung: ~s~/setweather [Wetter]")] - public void CmdAdminSetweather(Client player, string weather) + public void CmdAdminSetweather(Player player, string weather) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1631,7 +1560,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("showtuningmenu", "~m~Benutzung: ~s~/showtuningmenu")] - public void CmdAdminShowtuningmenu(Client player) + public void CmdAdminShowtuningmenu(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) { @@ -1645,21 +1574,21 @@ namespace ReallifeGamemode.Server.Commands #endregion #region ALevel1337 [Command("gotocp", "~m~Benutzung: ~s~/gotocp")] - public void CmdAdminGotocp(Client admin) + public void CmdAdminGotocp(Player admin) { admin.TriggerEvent("getCP"); } [RemoteEvent("sendCP")] - public void sendCPfunc(Client user, int x, int y, int z) + public void sendCPfunc(Player user, int x, int y, int z) { Vector3 pos = new Vector3(x, y, z); user.Position = pos; } [Command("sethandmoney", "~m~Benutzung: ~s~/sethandmoney [Name/ID] [Menge]")] - public void CmdAdminSetUserHandMoney(Client admin, string targetname, int amount) + public void CmdAdminSetUserHandMoney(Player admin, string targetname, int amount) { if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1667,7 +1596,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(targetname); + Player target = PlayerService.GetPlayerByNameOrId(targetname); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(target); @@ -1685,7 +1614,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("givehandmoney", "~m~Benutzung: ~s~/givehandmoney [Name/ID] [Menge]")] - public void CmdAdminGiveUserHandMoney(Client admin, string targetname, int amount) + public void CmdAdminGiveUserHandMoney(Player admin, string targetname, int amount) { if (!admin.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1693,7 +1622,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(targetname); + Player target = PlayerService.GetPlayerByNameOrId(targetname); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(target); @@ -1711,7 +1640,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("quicksavemode", "~m~Benutzung: ~s~/quicksavemode [Modus]: ~g~blip, ~g~atm")] - public void CmdAdminSetQuickSaveMode(Client player, string mode) + public void CmdAdminSetQuickSaveMode(Player player, string mode) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1722,7 +1651,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("giveitem", "~m~Benutzung: ~s~/giveitem [Target] [Item ID] [Anzahl]")] - public void CmdAdminGiveItem(Client player, string targetname, int itemId, int amount) + public void CmdAdminGiveItem(Player player, string targetname, int itemId, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1730,7 +1659,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(targetname); + Player target = PlayerService.GetPlayerByNameOrId(targetname); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -1760,7 +1689,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("inventory", "~m~Benutzung: ~s~/inventory [Spieler]")] - public void CmdAdminGiveItem(Client player, string targetname) + public void CmdAdminGiveItem(Player player, string targetname) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1768,7 +1697,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(targetname); + Player target = PlayerService.GetPlayerByNameOrId(targetname); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -1781,7 +1710,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("editmode", "~m~Benutzung: ~s~/editmode")] - public void CmdAdminToggleEditMode(Client player) + public void CmdAdminToggleEditMode(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1789,7 +1718,7 @@ namespace ReallifeGamemode.Server.Commands return; } - if (player.GetData("editmode") == false) + if (player.GetData("editmode") == false) { player.SetData("editmode", true); player.SendNotification("Edit-Mode ~g~aktiviert"); @@ -1805,7 +1734,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setbliptemplate", "~m~Benutzung: ~s~/setbliptemplate [byte COLOR] [byte ALPHA] [bool SHORTRANGE] [uint SPRITE] [float SCALE] [string NAME]", GreedyArg = true)] - public void CmdAdminSetBlipTemplate(Client player, byte color, byte alpha, bool shortRange, uint sprite, float scale, string name) + public void CmdAdminSetBlipTemplate(Player player, byte color, byte alpha, bool shortRange, uint sprite, float scale, string name) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1827,7 +1756,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("ipl", "~m~Benutzung: ~s~/ipl [Load / Remove] [Name]")] - public void CmdAdminIpl(Client player, string option, string name) + public void CmdAdminIpl(Player player, string option, string name) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1854,7 +1783,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("freekh", "~m~Benutzung: ~s~/freekh (Radius)")] - public void CmdAdminFreekh(Client player, float radius = -1) + public void CmdAdminFreekh(Player player, float radius = -1) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1867,21 +1796,21 @@ namespace ReallifeGamemode.Server.Commands string toPlayerChat = "~b~Admin " + player.Name + " hat alle Spieler wiederbelebt"; string toPlayerNotification = "Du wurdest von Admin ~y~" + player.Name + "~s~ wiederbelebt."; - foreach (var managedClient in peopleInRange) + foreach (var managedPlayer in peopleInRange) { - if (!managedClient.IsLoggedIn()) continue; - if (!managedClient.HasData("isDead") || managedClient.GetData("isDead") == false) continue; + if (!managedPlayer.IsLoggedIn()) continue; + if (!managedPlayer.HasData("isDead") || managedPlayer.GetData("isDead") == false) continue; playerRevided++; - managedClient.TriggerEvent("onPlayerRevived"); - managedClient.SetData("isDead", false); - managedClient.SendNotification(toPlayerNotification); - ChatService.SendMessage(managedClient, toPlayerChat); + managedPlayer.TriggerEvent("onPlayerRevived"); + managedPlayer.SetData("isDead", false); + managedPlayer.SendNotification(toPlayerNotification); + ChatService.SendMessage(managedPlayer, toPlayerChat); - NAPI.Player.SpawnPlayer(managedClient, managedClient.Position); - managedClient.Health = 100; + NAPI.Player.SpawnPlayer(managedPlayer, managedPlayer.Position); + managedPlayer.Health = 100; - MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == managedClient.Name); + MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == managedPlayer.Name); Medic.RemoveTaskFromList(task); } @@ -1889,7 +1818,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("ainvite", "~m~Benutzung: ~s~/ainvite [Name] [Fraktion]")] - public void CmdAdminAinvite(Client player, string name, int faction) + public void CmdAdminAinvite(Player player, string name, int faction) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1897,7 +1826,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -1955,7 +1884,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("makeleader", "~m~Benutzung: ~s~/makeleader [Name] [Fraktion]")] - public void CmdAdminMakeleader(Client player, string name, int faction) + public void CmdAdminMakeleader(Player player, string name, int faction) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -1963,7 +1892,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -2012,7 +1941,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("save", "~m~Benutzung: ~s~/save [Typ = ~g~Blip~s~, ~g~Goto (X)~s~, ~r~Marker~s~, ~r~Ped~s~, ~r~Pickup~s~, ~r~TextLabel~s~, ~g~Vehicle~s~, ~g~FVehicle~s~, ~g~SVehicle (X)~s~, ~g~JVehicle (X)~s~, ~g~Location~s~] (Weitere Angaben) = (X)", GreedyArg = true)] - public void CmdAdminSave(Client player, string typ, string option1 = null, string option2 = null) + public void CmdAdminSave(Player player, string typ, string option1 = null, string option2 = null) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2217,7 +2146,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("remove", "~m~Benutzung: ~s~/remove [Vehicle, Goto] [Option]")] - public void CmdAdminRemove(Client player, string type, string option = "") + public void CmdAdminRemove(Player player, string type, string option = "") { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2288,7 +2217,7 @@ namespace ReallifeGamemode.Server.Commands #region loadCommand [Command("load", "~m~Benutzung: ~s~/load [Typ = OnlineBunkers, ArcadiusBusinessCentre, MazeBankBuilding, LomBank, MazeBankWest, ClubWareHouse, SpecialLocations, GRHYacht, DHYacht, PYacht, AircraftCarrier, BridgeTC, BridgeTN, NorthYankton, ONeilsFarmB, ONeilsFarm, Morgue")] - public void CmdAdminloadlocation(Client player, string typ) + public void CmdAdminloadlocation(Player player, string typ) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2515,7 +2444,7 @@ namespace ReallifeGamemode.Server.Commands // [Command("managefactionranks", "~m~Benutzung: ~s~/managefactionranks [Fraktions-ID]")] - public void CmdFactionManageFactionRanks(Client player, int factionID) + public void CmdFactionManageFactionRanks(Player player, int factionID) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2556,7 +2485,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("aspeed", "~m~Benutzung: ~s~/aspeed [Modifier]")] //TODO: Überarbeiten ?? SetPlayerVelocity ?? - public void CmdAdminAspeed(Client player, int modifier) + public void CmdAdminAspeed(Player player, int modifier) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2580,14 +2509,14 @@ namespace ReallifeGamemode.Server.Commands } [Command("setmoney", "~m~Benutzung: ~s~/setmoney [Name] [Menge]")] - public void SetPlayerMoney(Client player, string receiver, int amount) + public void SetPlayerMoney(Player player, string receiver, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { ChatService.NotAuthorized(player); return; } - Client target = ClientService.GetClientByNameOrId(receiver); + Player target = PlayerService.GetPlayerByNameOrId(receiver); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -2604,7 +2533,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("givemoney", "~m~Benutzung: ~s~/givemoney [Name] [Menge]")] - public void GivePlayerMoney(Client player, string receiver, int amount) + public void GivePlayerMoney(Player player, string receiver, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2612,7 +2541,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(receiver); + Player target = PlayerService.GetPlayerByNameOrId(receiver); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -2629,7 +2558,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setbusinessowner", "~m~Benutzung: ~s~/setbusinessowner [Name] [Business ID]")] - public void CmdAdminSetbusinessowner(Client player, string name, int businessid) + public void CmdAdminSetbusinessowner(Player player, string name, int businessid) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2637,7 +2566,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -2674,7 +2603,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("clearbusiness", "~m~Benutzung:~s~ /clearbusiness [Business ID]")] - public void CmdAdminClearbusiness(Client player, int businessid) + public void CmdAdminClearbusiness(Player player, int businessid) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2701,7 +2630,7 @@ namespace ReallifeGamemode.Server.Commands owner.BusinessId = null; business.GetBankAccount(dbContext).Balance = 0; - ChatService.SendMessage(owner.Client, "~b~[ADMIN]~s~ Dir wurde von ~y~" + player.Name + "~s~ dein Business entzogen."); + ChatService.SendMessage(owner.Player, "~b~[ADMIN]~s~ Dir wurde von ~y~" + player.Name + "~s~ dein Business entzogen."); ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du hast ~y~" + owner.Name + "~s~ sein Business ~o~" + business.Name + "~s~ entzogen."); dbContext.SaveChanges(); @@ -2710,7 +2639,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setbusinessbankbalance", "~m~Benutzung: ~s~/setbusinessbankbalance [Business ID] [Menge]")] - public void CmdAdminGivebusinessbankbalance(Client player, int businessid, int amount) + public void CmdAdminGivebusinessbankbalance(Player player, int businessid, int amount) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2729,7 +2658,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("interior", "~m~Benutzung: ~s~/interior [Add / Remove / SetEnter / SetExit] [Name / ID]")] - public void CmdAdminInterior(Client player, string option1, string option2) + public void CmdAdminInterior(Player player, string option1, string option2) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2829,7 +2758,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("reloaddoors", "~m~Benutzung: ~s~/reloaddoors")] - public void CmdAdminReloaddoors(Client player) + public void CmdAdminReloaddoors(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2842,7 +2771,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("house", "~m~Benutzung: ~s~/house [add / remove / price / type / reloadhouses]", GreedyArg = true)] - public void CmdAdminHouse(Client player, string option1, string option2 = null) + public void CmdAdminHouse(Player player, string option1, string option2 = null) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2900,7 +2829,7 @@ namespace ReallifeGamemode.Server.Commands foreach (HouseRental rental in dbContext.HouseRentals.Include(r => r.User).Where(r => r.HouseId == nearHouse.Id)) { - rental.User.Client?.SendChatMessage("!{#81F7BE}* Dein Mietvertrag wurde administrativ aufgelöst!"); + rental.User.Player?.SendChatMessage("!{#81F7BE}* Dein Mietvertrag wurde administrativ aufgelöst!"); dbContext.HouseRentals.Remove(rental); } @@ -2981,7 +2910,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("paydaydrop", "~m~Benutzung: ~s~/paydaydrop")] - public void CmdAdminPaydaydrop(Client player) + public void CmdAdminPaydaydrop(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -2991,14 +2920,14 @@ namespace ReallifeGamemode.Server.Commands foreach (var target in NAPI.Pools.GetAllPlayers().Select(c => c.GetUser())) { - Economy.SetPaycheck(target.Client, target.Wage); + Economy.SetPaycheck(target.Player, target.Wage); } ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du hast ein Payday gedroppt."); } [Command("setwage", "~m~Benutzung: ~s~/setwage [Name/Id] [Lohn]")] - public void CmdAdminSetWage(Client player, string nameOrId, int wage) + public void CmdAdminSetWage(Player player, string nameOrId, int wage) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3006,7 +2935,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(nameOrId); + Player target = PlayerService.GetPlayerByNameOrId(nameOrId); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -3021,7 +2950,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setweaponrack", "~m~Benutzung: ~s~/setweaponrack [Fraktion ID] [Waffen Model] [SlotID (1-4)]")] - public void CmdAdminSetWeaponrack(Client player, int factionID, string weaponModel, int slotId) + public void CmdAdminSetWeaponrack(Player player, int factionID, string weaponModel, int slotId) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3099,7 +3028,7 @@ namespace ReallifeGamemode.Server.Commands [Command("rmweaponrack", "~m~Benutzung: ~s~/rmweaponrack [Fraktion ID] [Waffen Model]")] - public void CmdAdminRmWeaponrack(Client player, int factionID, string weaponModel) + public void CmdAdminRmWeaponrack(Player player, int factionID, string weaponModel) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3153,7 +3082,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("business", "~m~Benutzung:~s~ /business [price] [Option]")] - public void CmdAdminBusiness(Client player, string option, string option1) + public void CmdAdminBusiness(Player player, string option, string option1) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3194,7 +3123,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("createturf", "~m~Benutzung:~s~ /createturf [radius]")] - public void CmdAdmCreateTurf(Client player, float option) + public void CmdAdmCreateTurf(Player player, float option) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3205,7 +3134,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setturf", "~m~Benutzung:~s~ /setturf (Name)")] - public void CmdAdmSetTurf(Client player, string name) + public void CmdAdmSetTurf(Player player, string name) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3216,18 +3145,18 @@ namespace ReallifeGamemode.Server.Commands } [Command("cancleturf", "~m~Benutzung:~s~ /cancleturf")] - public void CmdAdmCancleTurf(Client player) + public void CmdAdmCancleTurf(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { ChatService.NotAuthorized(player); return; } - Gangwar.Gangwar.loadClient(player); + Gangwar.Gangwar.loadPlayer(player); } [Command("reloadturfs", "~m~Benutzung:~s~ /ReloadTurfs")] - public void CmdAdmReloadTurf(Client player) + public void CmdAdmReloadTurf(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3235,11 +3164,11 @@ namespace ReallifeGamemode.Server.Commands return; } Gangwar.Gangwar.loadTurfs(); - Gangwar.Gangwar.loadTurfs_ToAllClients(); + Gangwar.Gangwar.loadTurfs_ToAllPlayers(); } [Command("deleteturf", "~m~Benutzung:~s~ /DeleteTurfs")] - public void CmdAdmDeleteTurf(Client player) + public void CmdAdmDeleteTurf(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3250,7 +3179,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("setturfpoint", "~m~Benutzung:~s~ /setturfpoint")] - public void CmdAdmSetTurfPoint(Client player) + public void CmdAdmSetTurfPoint(Player player) { if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true) { @@ -3263,7 +3192,7 @@ namespace ReallifeGamemode.Server.Commands #region ALevel1338 [Command("whitelist", "~m~Benutzung: ~s~/whitelist [Add / Remove] [Socialclub Name]")] - public void CmdAdminWhitelist(Client player, string option, string scName) + public void CmdAdminWhitelist(Player player, string option, string scName) { if (!player.GetUser()?.IsAdmin(AdminLevel.PROJEKTLEITUNG) ?? true) { @@ -3312,7 +3241,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("blind", "~m~Benutzung: ~s~/blind [Name / ID] [Mode]")] - public void CmdBlind(Client player, string name, int mode) + public void CmdBlind(Player player, string name, int mode) { if (!player.IsLoggedIn()) return; @@ -3321,7 +3250,7 @@ namespace ReallifeGamemode.Server.Commands ChatService.NotAuthorized(player); return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (mode == 1) { @@ -3336,7 +3265,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("makeadmin", "~m~Benutzung: ~s~/makeadmin [Name] [Adminlevel]")] - public void CmdAdminMakeadmin(Client player, string name, int rank) + public void CmdAdminMakeadmin(Player player, string name, int rank) { if (!player.GetUser()?.IsAdmin(AdminLevel.PROJEKTLEITUNG) ?? true) { @@ -3350,7 +3279,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs index 4b1a9fe1..03821db0 100644 --- a/ReallifeGamemode.Server/Commands/FactionCommands.cs +++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs @@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Commands #region Chat Commands [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; if (f == null || f.StateOwned) @@ -40,7 +40,7 @@ namespace ReallifeGamemode.Server.Commands } [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; if (f == null || !f.StateOwned) @@ -56,7 +56,7 @@ namespace ReallifeGamemode.Server.Commands } [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; if (f == null || !f.StateOwned) @@ -76,7 +76,7 @@ namespace ReallifeGamemode.Server.Commands #endregion #region Leader Commands [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) { @@ -84,7 +84,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -116,7 +116,7 @@ namespace ReallifeGamemode.Server.Commands } [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) { @@ -135,7 +135,7 @@ namespace ReallifeGamemode.Server.Commands } [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) { @@ -177,7 +177,7 @@ namespace ReallifeGamemode.Server.Commands #region Sanitäter Commands [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) { @@ -191,7 +191,7 @@ namespace ReallifeGamemode.Server.Commands } var nearPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player); - var deadPlayer = nearPlayers.Where(i => i.GetData("isDead") == true).FirstOrDefault(); + var deadPlayer = nearPlayers.Where(i => i.GetData("isDead") == true).FirstOrDefault(); if (player == deadPlayer) { 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 - public void CmdFactionMedicHealive(Client player, string receiver) + public void CmdFactionMedicHealive(Player player, string receiver) { 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"); return; } - Client target = ClientService.GetClientByNameOrId(receiver); + Player target = PlayerService.GetPlayerByNameOrId(receiver); target.Health = 100; target.SendNotification("Du wurdest von ~g~" + player.Name + " ~s~geheilt.", false); player.SendNotification("Du hast ~g~" + target.Name + " ~s~geheilt.", false); @@ -230,7 +230,7 @@ namespace ReallifeGamemode.Server.Commands #endregion #region Staatsfraktionen (LSPD / FBI) Commands [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(); if (user == null || (user.FactionId != 1 && user.FactionId != 3)) @@ -245,7 +245,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(nameOrId); + Player target = PlayerService.GetPlayerByNameOrId(nameOrId); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -263,7 +263,7 @@ namespace ReallifeGamemode.Server.Commands } [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(); @@ -273,7 +273,7 @@ namespace ReallifeGamemode.Server.Commands return; } - Client target = ClientService.GetClientByNameOrId(nameOrId); + Player target = PlayerService.GetPlayerByNameOrId(nameOrId); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); diff --git a/ReallifeGamemode.Server/Commands/GroupCommands.cs b/ReallifeGamemode.Server/Commands/GroupCommands.cs index 799e51a4..9c7735a2 100644 --- a/ReallifeGamemode.Server/Commands/GroupCommands.cs +++ b/ReallifeGamemode.Server/Commands/GroupCommands.cs @@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Commands { #region Chat Commands [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; if (group == null) diff --git a/ReallifeGamemode.Server/Commands/UserCommands.cs b/ReallifeGamemode.Server/Commands/UserCommands.cs index ff06b7ae..f9372e7b 100644 --- a/ReallifeGamemode.Server/Commands/UserCommands.cs +++ b/ReallifeGamemode.Server/Commands/UserCommands.cs @@ -13,7 +13,7 @@ namespace ReallifeGamemode.Server.Commands class UserCommands : Script { [Command("dice", "~m~Benutzung: ~s~/dice")] - public void CmdUserDice(Client player) + public void CmdUserDice(Player player) { if (!player.IsLoggedIn()) return; @@ -22,15 +22,15 @@ namespace ReallifeGamemode.Server.Commands var peopleInRange = NAPI.Player.GetPlayersInRadiusOfPlayer(7, player); - foreach (var managedClient in peopleInRange) + foreach (var managedPlayer in peopleInRange) { - if (!managedClient.IsLoggedIn()) return; - ChatService.SendMessage(managedClient, "* " + player.Name + " hat eine " + number + " gewürfelt."); + if (!managedPlayer.IsLoggedIn()) return; + ChatService.SendMessage(managedPlayer, "* " + player.Name + " hat eine " + number + " gewürfelt."); } } [Command("car", "~m~Benutzung: ~s~/car")] - public void CmdUserCar(Client player) + public void CmdUserCar(Player player) { if (!player.IsLoggedIn()) return; if (!player.IsInVehicle) return; @@ -49,7 +49,7 @@ namespace ReallifeGamemode.Server.Commands } [Command("paycheck", "~m~Benutzung: ~s~/paycheck")] - public void CmdUserPaycheck(Client client) + public void CmdUserPaycheck(Player client) { User user = client.GetUser(); diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs index a8e834ef..f3946034 100644 --- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs @@ -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); } - private static void EntityEnterBusinessColShape(ColShape colShape, Client client) + private static void EntityEnterBusinessColShape(ColShape colShape, Player client) { if (client.IsInVehicle || !client.IsLoggedIn()) return; client.TriggerEvent("drivingSchoolMenu"); } - private static void EntityExitBusinessColShape(ColShape colShape, Client client) + private static void EntityExitBusinessColShape(ColShape colShape, Player client) { client.TriggerEvent("removeDrivingSchoolMenu"); } [RemoteEvent("startDrivingSchool")] - public void StartDrivingSchool(Client client) + public void StartDrivingSchool(Player client) { User user = client.GetUser(); if (user.DriverLicenseVehicle || client.HasData("ActiveSchool")) @@ -136,7 +136,7 @@ namespace ReallifeGamemode.Server.DrivingSchool } [RemoteEvent("timerCheckVehicle")] - public void TimerCheckVehicle(Client user) + public void TimerCheckVehicle(Player user) { Vehicle veh = user.Vehicle; @@ -158,7 +158,7 @@ namespace ReallifeGamemode.Server.DrivingSchool } [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.ResetData("ActiveSchool"); @@ -183,7 +183,7 @@ namespace ReallifeGamemode.Server.DrivingSchool [RemoteEvent("drivingSchoolEvent")] - public void DrivingSchoolEvent(Client user, int checkpoint) + public void DrivingSchoolEvent(Player user, int checkpoint) { if (checkpoint == 0) { @@ -208,7 +208,7 @@ namespace ReallifeGamemode.Server.DrivingSchool [RemoteEvent("startBikeSchool")] - public void StartBikeSchool(Client client) + public void StartBikeSchool(Player client) { User user = client.GetUser(); if (user.DriverLicenseBike || client.HasData("ActiveSchool")) @@ -235,7 +235,7 @@ namespace ReallifeGamemode.Server.DrivingSchool [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.ResetData("ActiveSchool"); @@ -260,7 +260,7 @@ namespace ReallifeGamemode.Server.DrivingSchool [RemoteEvent("bikeSchoolEvent")] - public void bikeSchoolEvent(Client user, int checkpoint) + public void bikeSchoolEvent(Player user, int checkpoint) { if (checkpoint == 0) { diff --git a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs index c0ac38cc..b428052e 100644 --- a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs @@ -56,20 +56,20 @@ namespace ReallifeGamemode.Server.DrivingSchool _colShape1.OnEntityExitColShape += EntityExitBusinessColShape; 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; client.TriggerEvent("planeSchoolMenu"); } - private static void EntityExitBusinessColShape(ColShape colShape, Client client) + private static void EntityExitBusinessColShape(ColShape colShape, Player client) { client.TriggerEvent("removeplaneSchoolMenu"); } [RemoteEvent("startplaneSchool")] - public void StartplaneSchool(Client client) + public void StartplaneSchool(Player client) { User user = client.GetUser(); @@ -95,7 +95,7 @@ namespace ReallifeGamemode.Server.DrivingSchool } [RemoteEvent("timerCheckVehicle1")] - public void TimerCheckVehicle1(Client user) + public void TimerCheckVehicle1(Player user) { Vehicle veh = user.Vehicle; @@ -111,7 +111,7 @@ namespace ReallifeGamemode.Server.DrivingSchool } [RemoteEvent("planeSchoolEventEnd")] - public void planeSchoolEventEnd(Client user, int checkpoint) + public void planeSchoolEventEnd(Player user, int checkpoint) { Vehicle veh = user.Vehicle; user.WarpOutOfVehicle(); @@ -133,7 +133,7 @@ namespace ReallifeGamemode.Server.DrivingSchool user.Position = new Vector3(-1083.96, -2476.96, 13.07); } [RemoteEvent("planeSchoolEvent")] - public void planeSchoolEvent(Client user, int checkpoint) + public void planeSchoolEvent(Player user, int checkpoint) { switch (checkpoint) { diff --git a/ReallifeGamemode.Server/Events/Chat.cs b/ReallifeGamemode.Server/Events/Chat.cs index c493bd74..ab6ac283 100644 --- a/ReallifeGamemode.Server/Events/Chat.cs +++ b/ReallifeGamemode.Server/Events/Chat.cs @@ -7,7 +7,7 @@ namespace ReallifeGamemode.Server.Events public class Chat : Script { [ServerEvent(Event.ChatMessage)] - public void ChatEvent(Client player, string message) + public void ChatEvent(Player player, string message) { string serverMsg = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", ""); if (serverMsg.Trim().Length == 0) return; diff --git a/ReallifeGamemode.Server/Events/Connect.cs b/ReallifeGamemode.Server/Events/Connect.cs index 704ed08c..12cf9342 100644 --- a/ReallifeGamemode.Server/Events/Connect.cs +++ b/ReallifeGamemode.Server/Events/Connect.cs @@ -18,11 +18,10 @@ namespace ReallifeGamemode.Server.Events class Connect : Script { [ServerEvent(Event.PlayerConnected)] - public void OnPlayerConnected(Client player) + public void OnPlayerConnected(Player player) { player.SetData("isLoggedIn", false); player.Position = new Vector3(-1883.736, -781.4911, -10); - player.FreezePosition = true; using (var dbContext = new DatabaseContext()) @@ -49,7 +48,7 @@ namespace ReallifeGamemode.Server.Events } - private bool IsPlayerBanned(Client player) + private bool IsPlayerBanned(Player player) { using (var dbContext = new DatabaseContext()) { diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index 8154e475..7200f8e2 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Events public class Death : Script { [ServerEvent(Event.PlayerDeath)] - public void OnPlayerDeath(Client player, Client killer, uint reason) + public void OnPlayerDeath(Player player, Player killer, uint reason) { if (!player.IsLoggedIn()) player.Kick(); player.SetData("isDead", true); @@ -121,7 +121,7 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("RespawnPlayerAtHospital")] - public void RespawnPlayerAtHospital(Client player) + public void RespawnPlayerAtHospital(Player player) { player.SetData("isDead", false); player.RemoveAllWeapons(); diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 9adf66c9..43b4fec3 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -22,7 +22,7 @@ namespace ReallifeGamemode.Server.Events public class Disconnect : Script { [ServerEvent(Event.PlayerDisconnected)] - public void OnPlayerDisconnected(Client player, DisconnectionType type, string reason) + public void OnPlayerDisconnected(Player player, DisconnectionType type, string reason) { if (!player.IsLoggedIn()) return; @@ -61,7 +61,7 @@ namespace ReallifeGamemode.Server.Events user.PositionY = pos.Y; user.PositionZ = pos.Z; saveUser.SaveChanges(); - user.Dead = player.HasData("isDead") ? (bool)player.GetData("isDead") : false; + user.Dead = player.HasData("isDead") ? (bool)player.GetData("isDead") : false; } player.SetData("isLoggedIn", false); } diff --git a/ReallifeGamemode.Server/Events/EnterVehicle.cs b/ReallifeGamemode.Server/Events/EnterVehicle.cs index b5009190..c904279d 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicle.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicle.cs @@ -12,16 +12,16 @@ namespace ReallifeGamemode.Server.Events public class EnterVehicle : Script { [ServerEvent(Event.PlayerEnterVehicle)] - public void OnPlayerEnterVehicle(Client client, GTANetworkAPI.Vehicle vehicle, sbyte seat) + public void OnPlayerEnterVehicle(Player client, GTANetworkAPI.Vehicle vehicle, sbyte seat) { if (seat != -1) return; if (vehicle.GetServerVehicle() is FactionVehicle veh) { - if (client.GetUser().FactionId != null && (veh.FactionId == client.GetUser().FactionId) && (veh.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData("weaponDeal") == true) + if (client.GetUser().FactionId != null && (veh.FactionId == client.GetUser().FactionId) && (veh.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData("weaponDeal") == true) { Vector3 vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value); - if (vector == null) + if (vector == new Vector3()) return; List dealPoint = new List(); dealPoint.Add(vector); diff --git a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs index 70154241..d976de03 100644 --- a/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs +++ b/ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs @@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Events public class EnterVehicleAttempt : Script { [ServerEvent(Event.PlayerEnterVehicleAttempt)] - public void OnPlayerEnterVehicleAttempt(Client player, GTANetworkAPI.Vehicle vehicle, sbyte seat) + public void OnPlayerEnterVehicleAttempt(Player player, GTANetworkAPI.Vehicle vehicle, sbyte seat) { if ((VehicleHash)vehicle.Model == VehicleHash.Dune3) { @@ -44,7 +44,7 @@ namespace ReallifeGamemode.Server.Events player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true); return; } - if (sVeh.SchoolId != player.GetData("ActiveSchool")) + if (sVeh.SchoolId != player.GetData("ActiveSchool")) { player.StopAnimation(); player.SendNotification("~r~Du darfst dieses Fahrzeug nicht benutzen!", true); diff --git a/ReallifeGamemode.Server/Events/ExitVehicle.cs b/ReallifeGamemode.Server/Events/ExitVehicle.cs index af54459b..cfca2ee8 100644 --- a/ReallifeGamemode.Server/Events/ExitVehicle.cs +++ b/ReallifeGamemode.Server/Events/ExitVehicle.cs @@ -13,13 +13,13 @@ namespace ReallifeGamemode.Server.Events public class ExitVehicle : Script { [ServerEvent(Event.PlayerExitVehicleAttempt)] - public void OnPlayerExitVehicle(Client client, GTANetworkAPI.Vehicle vehicle) + public void OnPlayerExitVehicle(Player client, GTANetworkAPI.Vehicle vehicle) { if (client.VehicleSeat != -1) return; if (vehicle.GetServerVehicle() is FactionVehicle veh) { - if ((client.GetUser().FactionId != null) && (veh.FactionId == client.GetUser().FactionId) && ((VehicleHash)vehicle.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData("weaponDeal") == true) + if ((client.GetUser().FactionId != null) && (veh.FactionId == client.GetUser().FactionId) && ((VehicleHash)vehicle.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData("weaponDeal") == true) { CheckPointHandle.RemovePlayerHandlerFromList(client); client.TriggerEvent("destroyCP"); diff --git a/ReallifeGamemode.Server/Events/Faction.cs b/ReallifeGamemode.Server/Events/Faction.cs index 62a93984..2433cf87 100644 --- a/ReallifeGamemode.Server/Events/Faction.cs +++ b/ReallifeGamemode.Server/Events/Faction.cs @@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Events class Faction : Script { [RemoteEvent("OnFactionRanksEdit")] - public void OnFactionRanksEdit(Client player, string jsonData) + public void OnFactionRanksEdit(Player player, string jsonData) { FactionRankHelper helper = JsonConvert.DeserializeObject(jsonData); using (var context = new DatabaseContext()) diff --git a/ReallifeGamemode.Server/Events/Inventory.cs b/ReallifeGamemode.Server/Events/Inventory.cs index 4064a6be..a72edfac 100644 --- a/ReallifeGamemode.Server/Events/Inventory.cs +++ b/ReallifeGamemode.Server/Events/Inventory.cs @@ -16,7 +16,7 @@ namespace ReallifeGamemode.Server.Events public class Inventory : Script { [RemoteEvent("getNearVehicles")] - public void SrvEvent_GetNearVehicles(Client client) + public void SrvEvent_GetNearVehicles(Player client) { var user = client.GetUser(); if (!client.IsInVehicle) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 34b8b7f3..bb57ae1b 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -26,12 +26,12 @@ namespace ReallifeGamemode.Server.Events public class Key : Script { [RemoteEvent("keyPress:NUM2")] - public void KeyPressNUM2(Client player) + public void KeyPressNUM2(Player player) { if (!player.IsLoggedIn()) return; - if (player.GetData("editmode") == true && player.GetUser().IsAdmin(AdminLevel.HEADADMIN) == true) + if (player.GetData("editmode") == true && player.GetUser().IsAdmin(AdminLevel.HEADADMIN) == true) { - var saveMode = player.GetData("quicksavemode"); + var saveMode = player.GetData("quicksavemode"); switch (saveMode) { case "none": @@ -56,25 +56,25 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("keyPress:UP_ARROW")] - public void KeyPressUpArrow(Client player) + public void KeyPressUpArrow(Player player) { if (!player.IsLoggedIn()) return; if (player.HasData("nearATM")) { - ATMManager.ShowAtmUi(player, player.GetData("nearATM")); + ATMManager.ShowAtmUi(player, player.GetData("nearATM")); } } [RemoteEvent("keyPress:LEFT_ARROW")] - public void KeyPressLeftArrow(Client player) + public void KeyPressLeftArrow(Player player) { if (!player.IsLoggedIn()) return; - List nearbyPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(3, player); + List nearbyPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(3, player); if (nearbyPlayers.Count > 1) { List nearbyPlayerList = new List(); - foreach (Client nearPlayer in nearbyPlayers) + foreach (Player nearPlayer in nearbyPlayers) { if (nearPlayer.Name != player.Name) { @@ -90,7 +90,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("keyPress:RIGHT_ARROW")] - public void KeyPressRightArrow(Client player) + public void KeyPressRightArrow(Player player) { if (!player.IsLoggedIn()) return; User user = player.GetUser(); @@ -104,7 +104,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("keyPress:DOWN_ARROW")] - public void KeyPressDownArrow(Client player) + public void KeyPressDownArrow(Player player) { User u = player.GetUser(); if (u == null) return; @@ -136,7 +136,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("keyPress:E")] - public void KeyPressE(Client player) + public void KeyPressE(Player player) { if (!player.IsLoggedIn()) return; var user = player.GetUser(); @@ -164,7 +164,7 @@ namespace ReallifeGamemode.Server.Events if (player.GetUser().FactionId == 2) //Fire Department { int medicCount = 0; - foreach (Client c in NAPI.Pools.GetAllPlayers()) + foreach (Player c in NAPI.Pools.GetAllPlayers()) { if ((c.GetUser()?.Faction.Id ?? 0) == 2) { @@ -194,7 +194,6 @@ namespace ReallifeGamemode.Server.Events player.SetAccessories(2, 2, 0); break; } - player.NametagColor = nameTagColor; using (var context = new DatabaseContext()) { List clothes = context.CharacterClothes.Where(u => u.UserId == user.Id && u.Duty == true).ToList(); @@ -225,7 +224,6 @@ namespace ReallifeGamemode.Server.Events player.SendNotification("Du bist nun ~r~außer Dienst."); player.TriggerEvent("toggleDutyMode", false); NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", false); - player.NametagColor = new Color(255, 255, 255); player.SetSharedData("blipColor", 0); UpdateCharacterCloth.LoadCharacterDefaults(player); } @@ -306,7 +304,7 @@ namespace ReallifeGamemode.Server.Events { List criminals = new List(); criminals.Add("Keiner"); - foreach (Client target in NAPI.Pools.GetAllPlayers()) + foreach (Player target in NAPI.Pools.GetAllPlayers()) { User c = target.GetUser(); if (c.JailTime > 0) @@ -344,17 +342,17 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("keyPress:I")] - public void KeyPressI(Client player) + public void KeyPressI(Player player) { if (!player.IsLoggedIn()) return; InventoryManager.GetUserItems(player); } [RemoteEvent("keyPress:O")] - public void KeyPressJ(Client player) + public void KeyPressJ(Player player) { if (!player.IsLoggedIn()) return; - List players = NAPI.Pools.GetAllPlayers(); + List players = NAPI.Pools.GetAllPlayers(); var listPlayers = players.Select(p => new { Id = p.Handle.Value, @@ -365,7 +363,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("keyPress:K")] - public void KeyPressK(Client player) + public void KeyPressK(Player player) { if (!player.IsLoggedIn()) return; var user = player.GetUser(); @@ -418,19 +416,19 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("keyPress:L")] - public void KeyPressL(Client player) + public void KeyPressL(Player player) { if (!player.IsLoggedIn()) return; DoorManager.ChangeDoorState(player); } [RemoteEvent("keyPress:N")] - public void KeyPressN(Client player) + public void KeyPressN(Player player) { if (!player.IsLoggedIn()) return; if (!player.IsInVehicle) return; - if (player.VehicleSeat != -1) return; + if (player.VehicleSeat != 0) return; GTANetworkAPI.Vehicle v = player.Vehicle; @@ -481,7 +479,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("keyPress:X")] - public void KeyPressX(Client player) + public void KeyPressX(Player player) { if (!player.IsLoggedIn()) return; @@ -493,7 +491,7 @@ namespace ReallifeGamemode.Server.Events GroundItem.PickUpGroundItem(player); } - if (player.IsInVehicle && player.VehicleSeat == -1) + if (player.IsInVehicle && player.VehicleSeat == 0) { ServerVehicle veh = player.Vehicle.GetServerVehicle(); if (veh != null) diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs index 273adcb8..698d3784 100644 --- a/ReallifeGamemode.Server/Events/Login.cs +++ b/ReallifeGamemode.Server/Events/Login.cs @@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Events public class Login : Script { [RemoteEvent("CLIENT:Login_LoginRequest")] - public void OnPlayerLogin(Client player, string username, string password) + public void OnPlayerLogin(Player player, string username, string password) { using (var dbContext = new DatabaseContext()) { @@ -52,7 +52,7 @@ namespace ReallifeGamemode.Server.Events player.SetData("spec", true); player.SetData("duty", false); player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney, 0); - Gangwar.Gangwar.loadClient(player); + Gangwar.Gangwar.loadPlayer(player); if (player.GetUser().FactionLeader) { player.TriggerEvent("CLIENT:Turf_LoadLeaderBlip"); diff --git a/ReallifeGamemode.Server/Events/Register.cs b/ReallifeGamemode.Server/Events/Register.cs index f8b1214f..6a5acae9 100644 --- a/ReallifeGamemode.Server/Events/Register.cs +++ b/ReallifeGamemode.Server/Events/Register.cs @@ -14,7 +14,7 @@ namespace ReallifeGamemode.Server.Events class Register : Script { [RemoteEvent("CLIENT:Login_RegisterRequest")] - public void OnPlayerRegister(Client player, string username, string password, string passwordRepeat) + public void OnPlayerRegister(Player player, string username, string password, string passwordRepeat) { using (var dbContext = new DatabaseContext()) { diff --git a/ReallifeGamemode.Server/Events/ResourceStop.cs b/ReallifeGamemode.Server/Events/ResourceStop.cs index bd74deb4..3eced20a 100644 --- a/ReallifeGamemode.Server/Events/ResourceStop.cs +++ b/ReallifeGamemode.Server/Events/ResourceStop.cs @@ -17,7 +17,7 @@ namespace ReallifeGamemode.Server.Events { var users = NAPI.Pools.GetAllPlayers(); - foreach (Client user in users) + foreach (Player user in users) { using (var saveUsers = new DatabaseContext()) { diff --git a/ReallifeGamemode.Server/Events/Siren.cs b/ReallifeGamemode.Server/Events/Siren.cs index 9fd13c24..d21a4a3d 100644 --- a/ReallifeGamemode.Server/Events/Siren.cs +++ b/ReallifeGamemode.Server/Events/Siren.cs @@ -10,9 +10,9 @@ namespace ReallifeGamemode.Server.Events private readonly Dictionary _sirenStates = new Dictionary(); [RemoteEvent("keyPress:B:toggleSiren")] - public void ToggleSirenEvent(Client player) + public void ToggleSirenEvent(Player player) { - if (!player.IsInVehicle || player.VehicleSeat != -1) return; + if (!player.IsInVehicle || player.VehicleSeat != 0) return; GTANetworkAPI.Vehicle pV = player.Vehicle; bool oldValue = _sirenStates.ContainsKey(pV.Handle) ? _sirenStates[pV.Handle] : false; bool newValue = !oldValue; diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs index aadbf946..bc1aeead 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs @@ -11,7 +11,7 @@ namespace ReallifeGamemode.Server.Events public class UpdateCharacterCloth : Script { [RemoteEvent("updateDutyProp")] - public void UpdateDutyProp(Client player, int componentId, int componentVariation) + public void UpdateDutyProp(Player player, int componentId, int componentVariation) { if (componentId != -1) { @@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("updateDutyCloth")] - public void UpdateDutyCloth(Client player, int componentId, int componentVariation) + public void UpdateDutyCloth(Player player, int componentId, int componentVariation) { if (componentId == 11) { @@ -51,7 +51,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("saveCharacterCloth")] - public void SaveDutyCloth(Client client, string JSlotType, string JSlotId, string JClothId) + public void SaveDutyCloth(Player client, string JSlotType, string JSlotId, string JClothId) { using (var context = new DatabaseContext()) { @@ -126,7 +126,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("defaultCharacterCloth")] - public static void LoadCharacterDefaults(Client player) + public static void LoadCharacterDefaults(Player player) { User user = player.GetUser(); using (var context = new DatabaseContext()) @@ -153,7 +153,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("SERVER:BuyCharacterClothes")] - public void RmtEvent_BuyClothes(Client client, string type, string jsonData) + public void RmtEvent_BuyClothes(Player client, string type, string jsonData) { /* * [0] ComponentID diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs b/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs index fd37218b..b8958b05 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterElevator.cs @@ -9,8 +9,8 @@ namespace ReallifeGamemode.Server.Events { public class UpdateCharacterElevator : Script { - [RemoteEvent("sendClientToStage")] - public void SaveWeaponSelection(Client client, string stage) + [RemoteEvent("sendPlayerToStage")] + public void SaveWeaponSelection(Player client, string stage) { ElevatorPoint elevator = PositionManager.ElevatorPoints.Find(e => e.Stage == stage); if (elevator != null) diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs index cf510e2e..9dcf4d58 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs @@ -10,7 +10,7 @@ namespace ReallifeGamemode.Server.Events public class UpdateCharacterWeapon : Script { [RemoteEvent("updateWeaponSelection")] - public void UpdateWeaponSelection(Client client, string weaponModel, int slot) + public void UpdateWeaponSelection(Player client, string weaponModel, int slot) { if (weaponModel == "Keine") { @@ -43,14 +43,14 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("cancelWeaponSelection")] - public void CancelWeaponSelection(Client client) + public void CancelWeaponSelection(Player client) { client.RemoveAllWeapons(); } [RemoteEvent("saveWeaponSelection")] - public void SaveWeaponSelection(Client client, string primaryModel, string secondaryModel, string meleeModel, string specialModel) + public void SaveWeaponSelection(Player client, string primaryModel, string secondaryModel, string meleeModel, string specialModel) { client.RemoveAllWeapons(); if (!uint.TryParse(primaryModel, out uint primary)) diff --git a/ReallifeGamemode.Server/Events/Vehicle.cs b/ReallifeGamemode.Server/Events/Vehicle.cs index 44a3fa13..3716c620 100644 --- a/ReallifeGamemode.Server/Events/Vehicle.cs +++ b/ReallifeGamemode.Server/Events/Vehicle.cs @@ -11,9 +11,9 @@ namespace ReallifeGamemode.Server.Events public class Vehicle : Script { [RemoteEvent("VehicleMenu_ToggleEngine")] - public void VehicleMenuToggleEngineEvent(Client player) + public void VehicleMenuToggleEngineEvent(Player player) { - if (player.IsInVehicle && player.VehicleSeat == -1) + if (player.IsInVehicle && player.VehicleSeat == 0) { GTANetworkAPI.Vehicle v = player.Vehicle; @@ -72,9 +72,9 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("VehicleMenu_LockCar")] - public static void VehicleMenuLockCarEvent(Client player) + public static void VehicleMenuLockCarEvent(Player player) { - if (player.IsInVehicle && player.VehicleSeat == -1) + if (player.IsInVehicle && player.VehicleSeat == 0) { GTANetworkAPI.Vehicle v = player.Vehicle; @@ -182,9 +182,9 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("CLIENT:VehicleMenu_ParkCar")] - public void VehicleMenuParkCarEvent(Client player) + public void VehicleMenuParkCarEvent(Player player) { - if (player.IsInVehicle && player.VehicleSeat == -1) + if (player.IsInVehicle && player.VehicleSeat == 0) { GTANetworkAPI.Vehicle v = player.Vehicle; @@ -247,7 +247,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("VehicleMenu_ToggleSingleDoor")] - public void VehicleMenuToggleSingleDoorEvent(Client player, int door) + public void VehicleMenuToggleSingleDoorEvent(Player player, int door) { if (!player.IsInVehicle) return; GTANetworkAPI.Vehicle veh = player.Vehicle; @@ -260,7 +260,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("VehicleMenu_OpenAllDoors")] - public void VehicleMenuOpenAllDoorsEvent(Client player) + public void VehicleMenuOpenAllDoorsEvent(Player player) { if (!player.IsInVehicle) return; GTANetworkAPI.Vehicle veh = player.Vehicle; @@ -272,7 +272,7 @@ namespace ReallifeGamemode.Server.Events } [RemoteEvent("VehicleMenu_CloseAllDoors")] - public void VehicleMenuCloseAllDoorsEvent(Client player) + public void VehicleMenuCloseAllDoorsEvent(Player player) { if (!player.IsInVehicle) return; GTANetworkAPI.Vehicle veh = player.Vehicle; diff --git a/ReallifeGamemode.Server/Events/Voice.cs b/ReallifeGamemode.Server/Events/Voice.cs index 992bf698..794708b5 100644 --- a/ReallifeGamemode.Server/Events/Voice.cs +++ b/ReallifeGamemode.Server/Events/Voice.cs @@ -11,13 +11,13 @@ namespace ReallifeGamemode.Server.Events class Voice : Script { [RemoteEvent("CLIENT:AddVoiceListener")] - public void AddPlayerVoiceListenerEvent(Client player, Client target) + public void AddPlayerVoiceListenerEvent(Player player, Player target) { player.EnableVoiceTo(target); } [RemoteEvent("CLIENT:RemoveVoiceListener")] - public void RemovePlayerVoiceListenerEvent(Client player, Client target) + public void RemovePlayerVoiceListenerEvent(Player player, Player target) { player.DisableVoiceTo(target); } diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index 1a71f1c6..553085d9 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -9,23 +9,23 @@ using System.Collections.Generic; 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 * @copyright (c) 2008 - 2018 Life of German */ namespace ReallifeGamemode.Server.Extensions { - public static class ClientExtension + public static class PlayerExtension { /// - /// Gibt das User-Objekt eines Client's zurück. - /// Gibt nichts zurück, wenn der Client nicht eingeloggt ist + /// Gibt das User-Objekt eines Player's zurück. + /// Gibt nichts zurück, wenn der Player nicht eingeloggt ist /// - /// Der Client, dessen User man bekommen möchte + /// Der Player, dessen User man bekommen möchte /// Ein eventuell vorhandener Datenbank-Context, falls man Änderungen in der Datenbank vornehmen will /// - public static User GetUser(this Client client, DatabaseContext context = null) + public static User GetUser(this Player client, DatabaseContext context = null) { context = context ?? new DatabaseContext(); if (!client.IsLoggedIn()) return null; @@ -55,16 +55,16 @@ namespace ReallifeGamemode.Server.Extensions } /// - /// Gibt zurück, ob ein Client eingeloggt ist + /// Gibt zurück, ob ein Player eingeloggt ist /// - /// Der Client, dessen Login-Status man bekommen möchte + /// Der Player, dessen Login-Status man bekommen möchte /// - 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("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 a = player.Heading + offset; @@ -78,8 +78,8 @@ namespace ReallifeGamemode.Server.Extensions internal static T GetData(this User user, string key, T nullValue) { key += "data_"; - if (!user.Client.HasData(key)) return nullValue; - return JsonConvert.DeserializeObject(user.Client.GetData(key)); + if (!user.Player.HasData(key)) return nullValue; + return JsonConvert.DeserializeObject(user.Player.GetData(key)); } internal static T GetData(this User user, string key) => user.GetData(key, default); @@ -87,10 +87,10 @@ namespace ReallifeGamemode.Server.Extensions internal static void SetData(this User user, string key, object value) { 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) { @@ -104,9 +104,9 @@ namespace ReallifeGamemode.Server.Extensions dbUser.Wanteds = newWanteds; dbContext.SaveChanges(); } - user.Client.SetSharedData("blipColor", 64); - ChatService.SendMessage(user.Client, "!{#FF614A}Du hast ein Verbrechen begangen: " + reason + "" + (cop != null ? " | Gemeldet von: " + cop.Name + "." : "")); - ChatService.SendMessage(user.Client, " !{#FFFF00}Fahnundgslevel:~s~ " + newWanteds); + user.Player.SetSharedData("blipColor", 64); + ChatService.SendMessage(user.Player, "!{#FF614A}Du hast ein Verbrechen begangen: " + reason + "" + (cop != null ? " | Gemeldet von: " + cop.Name + "." : "")); + ChatService.SendMessage(user.Player, " !{#FFFF00}Fahnundgslevel:~s~ " + newWanteds); 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()) { @@ -158,7 +158,7 @@ namespace ReallifeGamemode.Server.Extensions 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 }; - user.Client?.Kick(); + user.Player?.Kick(); 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 + "]"); 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); diff --git a/ReallifeGamemode.Server/Extensions/ListExtensions.cs b/ReallifeGamemode.Server/Extensions/ListExtensions.cs index b8fedb14..b834b8d5 100644 --- a/ReallifeGamemode.Server/Extensions/ListExtensions.cs +++ b/ReallifeGamemode.Server/Extensions/ListExtensions.cs @@ -8,7 +8,7 @@ namespace ReallifeGamemode.Server.Extensions { static class ListExtensions { - public static bool Contains(this List list, Client client) + public static bool Contains(this List list, Player client) { return list.Any(l => l.Handle.Value == client.Handle.Value); } diff --git a/ReallifeGamemode.Server/Extensions/VehicleExtension.cs b/ReallifeGamemode.Server/Extensions/VehicleExtension.cs index ce5005a7..1b84094f 100644 --- a/ReallifeGamemode.Server/Extensions/VehicleExtension.cs +++ b/ReallifeGamemode.Server/Extensions/VehicleExtension.cs @@ -13,7 +13,7 @@ namespace ReallifeGamemode.Server.Extensions 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(); } diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs index 5c35a560..c1357256 100644 --- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs +++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs @@ -62,7 +62,7 @@ namespace ReallifeGamemode.Server.Factions.Medic } } [RemoteEvent("loadMedicTasks")] - public void LoadMedicTasks(Client player, int type) + public void LoadMedicTasks(Player player, int type) { switch (type) { @@ -78,7 +78,7 @@ namespace ReallifeGamemode.Server.Factions.Medic } } [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) { diff --git a/ReallifeGamemode.Server/Finance/Economy.cs b/ReallifeGamemode.Server/Finance/Economy.cs index ce56d218..63dad210 100644 --- a/ReallifeGamemode.Server/Finance/Economy.cs +++ b/ReallifeGamemode.Server/Finance/Economy.cs @@ -22,7 +22,7 @@ namespace ReallifeGamemode.Server.Finance { public static Dictionary Paychecks { get; set; } = new Dictionary(); - 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; float financialHelp = -(float)Math.Pow(1.0005, -bankAccount) * -1000; @@ -33,7 +33,7 @@ namespace ReallifeGamemode.Server.Finance return (bankAccount, financialHelp, financialInterest); } - public static int GetVehicleTaxation(Client client) + public static int GetVehicleTaxation(Player client) { int vehicleTaxation = 0; using (var dbContext = new DatabaseContext()) @@ -141,7 +141,7 @@ namespace ReallifeGamemode.Server.Finance return vehicleTaxation; } - public static float GetPropertyTaxation(Client client) + public static float GetPropertyTaxation(Player client) { float propertyTaxation = 0; 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); float propertyTax = GetPropertyTaxation(client); @@ -169,7 +169,7 @@ namespace ReallifeGamemode.Server.Finance ReleasePayDay(client, paycheck); } - private static int GetRentalFees(Client client) + private static int GetRentalFees(Player client) { 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()) { diff --git a/ReallifeGamemode.Server/Gangwar/Gangwar.cs b/ReallifeGamemode.Server/Gangwar/Gangwar.cs index 1a7dec4f..630081a9 100644 --- a/ReallifeGamemode.Server/Gangwar/Gangwar.cs +++ b/ReallifeGamemode.Server/Gangwar/Gangwar.cs @@ -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())); } - public static void loadTurfs_ToAllClients() + public static void loadTurfs_ToAllPlayers() { NAPI.ClientEvent.TriggerClientEventForAll("GangAreas:Create", JsonConvert.SerializeObject(turfs.ToArray())); 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")) { foreach (var turf in getTurfs()) { - if (turf.getId() == victim.GetData("inGangWar")) + if (turf.getId() == victim.GetData("inGangWar")) { turf.setKill(victim.GetUser().Faction.Name); return; @@ -71,7 +71,7 @@ namespace ReallifeGamemode.Server.Gangwar } [RemoteEvent("Gangarea:Enter")] - public void RmtEvent_TurfEnter(Client client, string jsonId) + public void RmtEvent_TurfEnter(Player client, string jsonId) { int id = JsonConvert.DeserializeObject(jsonId); @@ -86,7 +86,7 @@ namespace ReallifeGamemode.Server.Gangwar } [RemoteEvent("Gangarea:Leave")] - public void RmtEvent_TurfLeave(Client client, string jsonId) + public void RmtEvent_TurfLeave(Player client, string jsonId) { int id = JsonConvert.DeserializeObject(jsonId); @@ -101,7 +101,7 @@ namespace ReallifeGamemode.Server.Gangwar } [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(jsonX); float pY = (float)JsonConvert.DeserializeObject(jsonY); @@ -125,11 +125,11 @@ namespace ReallifeGamemode.Server.Gangwar dbContext.SaveChanges(); } loadTurfs(); - loadTurfs_ToAllClients(); + loadTurfs_ToAllPlayers(); } [RemoteEvent("SERVER:DeleteTurf")] - public void RmtEvent_DeleteTurf(Client client, string jsonId) + public void RmtEvent_DeleteTurf(Player client, string jsonId) { int id = JsonConvert.DeserializeObject(jsonId); if (id == -1) @@ -145,13 +145,13 @@ namespace ReallifeGamemode.Server.Gangwar dbContext.Turfs.Remove(dturf); dbContext.SaveChanges(); loadTurfs(); - loadTurfs_ToAllClients(); + loadTurfs_ToAllPlayers(); } } } [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(jsonId); if (id == -1) { @@ -166,14 +166,14 @@ namespace ReallifeGamemode.Server.Gangwar dturf.Vector = vector; dbContext.SaveChanges(); loadTurfs(); - loadTurfs_ToAllClients(); + loadTurfs_ToAllPlayers(); } } } [RemoteEvent("SERVER:StartGangwar")] - public void RmtEvent_StartGangwar(Client client) + public void RmtEvent_StartGangwar(Player client) { if (!client.GetUser().FactionLeader) return; diff --git a/ReallifeGamemode.Server/Gangwar/Turf.cs b/ReallifeGamemode.Server/Gangwar/Turf.cs index ff7e0b9c..9daa5798 100644 --- a/ReallifeGamemode.Server/Gangwar/Turf.cs +++ b/ReallifeGamemode.Server/Gangwar/Turf.cs @@ -23,9 +23,9 @@ namespace ReallifeGamemode.Server.Gangwar public int Att_Score { get; set; } public int Def_Score { get; set; } public string status { get; set; } - public List playerInside { get; set; } + public List playerInside { get; set; } public Timer timer { get; set; } - public Client[] playerInGangwar { get; set; } + public Player[] playerInGangwar { get; set; } public int timerCount; @@ -40,7 +40,7 @@ namespace ReallifeGamemode.Server.Gangwar this.Def_Score = 50; this.status = "normal"; this.timer = null; - this.playerInside = new List(); + this.playerInside = new List(); this.timerCount = 0; } @@ -95,8 +95,8 @@ namespace ReallifeGamemode.Server.Gangwar /* try { - Client[] 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[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.GetUser().Faction.Name == this.Owner).ToArray(); + Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.GetUser().Faction.Name == this.Attacker).ToArray(); }catch(NullReferenceException ex) { int i = 0; @@ -115,7 +115,7 @@ namespace ReallifeGamemode.Server.Gangwar this.Def_Score -= attackers.Length - owners.Length; */ #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); } @@ -131,7 +131,7 @@ namespace ReallifeGamemode.Server.Gangwar { 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); } @@ -139,7 +139,7 @@ namespace ReallifeGamemode.Server.Gangwar this.Att_Score = 0; }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); } @@ -149,7 +149,7 @@ namespace ReallifeGamemode.Server.Gangwar } 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); } @@ -161,14 +161,14 @@ namespace ReallifeGamemode.Server.Gangwar } } - public void enter(Client client) + public void enter(Player client) { if (this.status == "attack") { if (client.GetUser().Faction.Name != getOwner() && client.GetUser().Faction.Name != getAttacker()) return; - Client gClient = playerInGangwar.Where(c => c.GetUser().Id == client.GetUser().Id).FirstOrDefault(); - if (gClient == null) + Player gPlayer = playerInGangwar.Where(c => c.GetUser().Id == client.GetUser().Id).FirstOrDefault(); + if (gPlayer == null) { 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) { @@ -203,8 +203,8 @@ namespace ReallifeGamemode.Server.Gangwar { if (getOwner() == FactionName) { - Client[] 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[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Owner).ToArray(); + Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Attacker).ToArray(); foreach (var o in owners) { o.TriggerEvent("CLIENT:win"); @@ -219,8 +219,8 @@ namespace ReallifeGamemode.Server.Gangwar 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()); - Client[] 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[] owners = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Owner).ToArray(); + Player[] attackers = NAPI.Pools.GetAllPlayers().Where(c => c.IsLoggedIn() && c.GetUser().Faction.Name == this.Attacker).ToArray(); foreach (var o in owners) { o.TriggerEvent("CLIENT:loose"); @@ -247,7 +247,7 @@ namespace ReallifeGamemode.Server.Gangwar } this.playerInGangwar = null; Gangwar.loadTurfs(); - Gangwar.loadTurfs_ToAllClients(); + Gangwar.loadTurfs_ToAllPlayers(); } public void attack(string attacker) @@ -263,9 +263,9 @@ namespace ReallifeGamemode.Server.Gangwar this.status = "attack"; using (var context = new DatabaseContext()) { - List clientsInGangwar = new List(); + List clientsInGangwar = new List(); - 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) { u.TriggerEvent("CLIENT:setAttackBlip", true, TurfID); diff --git a/ReallifeGamemode.Server/Inventory/GroundItem.cs b/ReallifeGamemode.Server/Inventory/GroundItem.cs index efd0ce8f..e199c7db 100644 --- a/ReallifeGamemode.Server/Inventory/GroundItem.cs +++ b/ReallifeGamemode.Server/Inventory/GroundItem.cs @@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.Inventory 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); if (nearest != null) diff --git a/ReallifeGamemode.Server/Inventory/Interfaces/IWeaponDealItem.cs b/ReallifeGamemode.Server/Inventory/Interfaces/IWeaponDealItem.cs index e07dc572..07698d89 100644 --- a/ReallifeGamemode.Server/Inventory/Interfaces/IWeaponDealItem.cs +++ b/ReallifeGamemode.Server/Inventory/Interfaces/IWeaponDealItem.cs @@ -8,6 +8,6 @@ namespace ReallifeGamemode.Server.Inventory.Interfaces { public interface IWeaponDealItem : IItem, IDroppableItem { - bool noTransfer(Client client, UserItem uItem, FactionVehicle fVeh); + bool noTransfer(Player client, UserItem uItem, FactionVehicle fVeh); } } diff --git a/ReallifeGamemode.Server/Inventory/Items/DropItem.cs b/ReallifeGamemode.Server/Inventory/Items/DropItem.cs index d7fb2b44..2ed4e902 100644 --- a/ReallifeGamemode.Server/Inventory/Items/DropItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/DropItem.cs @@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public abstract uint Object { 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); InventoryManager.RemoveUserItem(player.GetUser(), uItem, amount); diff --git a/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs b/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs index 495fbd5c..d19a19af 100644 --- a/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/FoodItem.cs @@ -22,7 +22,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public void Use(UserItem uItem) { - Client player = uItem.GetUser().Client; + Player player = uItem.GetUser().Player; int amountToAdd = HpAmount; if (player.Health + amountToAdd > 100) diff --git a/ReallifeGamemode.Server/Inventory/Items/WeaponDealItem.cs b/ReallifeGamemode.Server/Inventory/Items/WeaponDealItem.cs index efa6e31e..cd306e03 100644 --- a/ReallifeGamemode.Server/Inventory/Items/WeaponDealItem.cs +++ b/ReallifeGamemode.Server/Inventory/Items/WeaponDealItem.cs @@ -19,7 +19,7 @@ namespace ReallifeGamemode.Server.Inventory.Items public abstract uint Object { 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) return false; diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs index ce3eb07b..9cab0dc9 100644 --- a/ReallifeGamemode.Server/Job/BusDriverJob.cs +++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs @@ -97,7 +97,7 @@ namespace ReallifeGamemode.Server.Job JobStart += BusDriverJob_JobStart; } - private void BusDriverJob_JobStart(Client player) + private void BusDriverJob_JobStart(Player player) { List listRouteTexts = new List(); List listRouteTexts2 = new List(); @@ -127,7 +127,7 @@ namespace ReallifeGamemode.Server.Job } [RemoteEvent("startBusRoute")] - public void StartBusRoute(Client player, string type) + public void StartBusRoute(Player player, string type) { 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) { } diff --git a/ReallifeGamemode.Server/Job/JobBase.cs b/ReallifeGamemode.Server/Job/JobBase.cs index e3218979..ee7da34d 100644 --- a/ReallifeGamemode.Server/Job/JobBase.cs +++ b/ReallifeGamemode.Server/Job/JobBase.cs @@ -9,13 +9,13 @@ namespace ReallifeGamemode.Server.Job { public abstract class JobBase : Script { - public delegate void JobStartHandler(Client player); - public delegate void JobStopHandler(Client player); + public delegate void JobStartHandler(Player player); + public delegate void JobStopHandler(Player player); public event JobStartHandler JobStart; public event JobStopHandler JobStop; - private readonly List _inJob = new List(); + private readonly List _inJob = new List(); public abstract int Id { get; } @@ -23,7 +23,7 @@ namespace ReallifeGamemode.Server.Job public abstract bool NeedVehicleToStart { get; } - public void StartJob(Client player) + public void StartJob(Player player) { if (_inJob.Contains(player)) return; _inJob.Add(player); @@ -33,7 +33,7 @@ namespace ReallifeGamemode.Server.Job JobStart?.Invoke(player); } - public void StopJob(Client player, bool quit = false) + public void StopJob(Player player, bool quit = false) { if (!_inJob.Contains(player)) return; _inJob.Remove(player); @@ -54,6 +54,6 @@ namespace ReallifeGamemode.Server.Job } } - public List GetUsersInJob() => _inJob; + public List GetUsersInJob() => _inJob; } } diff --git a/ReallifeGamemode.Server/Job/PilotJob.cs b/ReallifeGamemode.Server/Job/PilotJob.cs index 4ae69665..2abe86b2 100644 --- a/ReallifeGamemode.Server/Job/PilotJob.cs +++ b/ReallifeGamemode.Server/Job/PilotJob.cs @@ -108,7 +108,7 @@ namespace ReallifeGamemode.Server.Job JobStart += PilotJob_JobStart; } - private void PilotJob_JobStart(Client player) + private void PilotJob_JobStart(Player player) { List listRouteTexts = new List(); List listRouteTexts2 = new List(); @@ -135,7 +135,7 @@ namespace ReallifeGamemode.Server.Job } [RemoteEvent("startPilotRoute")] - public void StartPilotRoute(Client player, string type) + public void StartPilotRoute(Player player, string type) { if (type == "Route 1") { diff --git a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs index f8d1ba37..909ac457 100644 --- a/ReallifeGamemode.Server/Job/TaxiDriverJob.cs +++ b/ReallifeGamemode.Server/Job/TaxiDriverJob.cs @@ -22,12 +22,12 @@ namespace ReallifeGamemode.Server.Job JobStop += TaxiDriverJobJobStop; } - private void TaxiDriverJobJobStart(Client player) + private void TaxiDriverJobJobStart(Player player) { player.Vehicle.SetSharedData("vehicleTaxiLight", true); } - private void TaxiDriverJobJobStop(Client player) + private void TaxiDriverJobJobStop(Player player) { player.Vehicle.SetSharedData("vehicleTaxiLight", false); } diff --git a/ReallifeGamemode.Server/Managers/ATMManager.cs b/ReallifeGamemode.Server/Managers/ATMManager.cs index fd953bf1..96cdc027 100644 --- a/ReallifeGamemode.Server/Managers/ATMManager.cs +++ b/ReallifeGamemode.Server/Managers/ATMManager.cs @@ -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("id")); } - public static void ExitATMRange(ColShape colShape, Client client) + public static void ExitATMRange(ColShape colShape, Player client) { client.ResetData("nearATM"); } - public static void ShowAtmUi(Client player, int atmId) + public static void ShowAtmUi(Player player, int atmId) { player.TriggerEvent("SERVER:ShowAtmUi", atmId); } [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(); using (var dbContext = new DatabaseContext()) { - int nearATM = client.GetData("nearATM"); + int nearATM = client.GetData("nearATM"); //SITE //0 Geld einzahlen //1 Geld auszahlen //2 Geld überweisen switch (site) { diff --git a/ReallifeGamemode.Server/Managers/BankManager.cs b/ReallifeGamemode.Server/Managers/BankManager.cs index 4c1e013e..3a48b02a 100644 --- a/ReallifeGamemode.Server/Managers/BankManager.cs +++ b/ReallifeGamemode.Server/Managers/BankManager.cs @@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Managers { 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()) { diff --git a/ReallifeGamemode.Server/Managers/BusinessManager.cs b/ReallifeGamemode.Server/Managers/BusinessManager.cs index f672eeec..409557fa 100644 --- a/ReallifeGamemode.Server/Managers/BusinessManager.cs +++ b/ReallifeGamemode.Server/Managers/BusinessManager.cs @@ -50,13 +50,13 @@ namespace ReallifeGamemode.Server.Managers 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(); } [RemoteEvent("Business_DepositMoney")] - public void BusinessDepositMoney(Client player, int amount) + public void BusinessDepositMoney(Player player, int amount) { User user = player.GetUser(); if (user == null) @@ -80,14 +80,14 @@ namespace ReallifeGamemode.Server.Managers } else if (result == TransactionResult.SUCCESS) { - playerBusiness.SendBusinessDataToClient(player); + playerBusiness.SendBusinessDataToPlayer(player); player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen"); return; } } [RemoteEvent("Business_WithdrawMoney")] - public void BusinessWithdrawMoney(Client player, int amount) + public void BusinessWithdrawMoney(Player player, int amount) { User user = player.GetUser(); if (user == null) @@ -111,14 +111,14 @@ namespace ReallifeGamemode.Server.Managers } else if (result == TransactionResult.SUCCESS) { - playerBusiness.SendBusinessDataToClient(player); + playerBusiness.SendBusinessDataToPlayer(player); player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen"); return; } } [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(); if (sVeh == null) return; @@ -137,7 +137,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("VehShop_BuyVehicle")] - public void CarDealerBusiness_BuyVehicle(Client player, string target) + public void CarDealerBusiness_BuyVehicle(Player player, string target) { ServerVehicle sVeh = player.Vehicle?.GetServerVehicle(); if (sVeh == null) return; @@ -217,7 +217,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("CLIENT:Business_BuyBusiness")] - public void BusinessEventBuyBusiness(Client player) + public void BusinessEventBuyBusiness(Player player) { BusinessBase business = GetNearBusiness(player); if (business == null) return; @@ -258,7 +258,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("CLIENT:Business_SellBusiness")] - public void BusinessEventSellBusiness(Client player) + public void BusinessEventSellBusiness(Player player) { BusinessBase business = GetNearBusiness(player); if (business == null) return; diff --git a/ReallifeGamemode.Server/Managers/CharacterCreator.cs b/ReallifeGamemode.Server/Managers/CharacterCreator.cs index 744e5d92..5ee91ce3 100644 --- a/ReallifeGamemode.Server/Managers/CharacterCreator.cs +++ b/ReallifeGamemode.Server/Managers/CharacterCreator.cs @@ -13,7 +13,7 @@ namespace ReallifeGamemode.Server.Managers } [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 jFeatureData = JArray.Parse(featureData); @@ -178,8 +178,8 @@ namespace ReallifeGamemode.Server.Managers /// /// Wendet den Character eines Spielers auf diesen an /// - /// Der Client, dessen Aussehen man setzen will - public static void ApplyCharacter(Client player) + /// Der Player, dessen Aussehen man setzen will + public static void ApplyCharacter(Player player) { var userId = player.GetUser().Id; using (var loadCharacter = new DatabaseContext()) diff --git a/ReallifeGamemode.Server/Managers/CityHallManager.cs b/ReallifeGamemode.Server/Managers/CityHallManager.cs index 6acad9d6..5d8680cf 100644 --- a/ReallifeGamemode.Server/Managers/CityHallManager.cs +++ b/ReallifeGamemode.Server/Managers/CityHallManager.cs @@ -35,7 +35,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("CLIENT:CityHall_CreateGroup")] - public void CreateGroup(Client player, string name) + public void CreateGroup(Player player, string name) { using (var dbContext = new DatabaseContext()) { diff --git a/ReallifeGamemode.Server/Managers/DoorManager.cs b/ReallifeGamemode.Server/Managers/DoorManager.cs index 0825e2ef..6bdd9f14 100644 --- a/ReallifeGamemode.Server/Managers/DoorManager.cs +++ b/ReallifeGamemode.Server/Managers/DoorManager.cs @@ -39,7 +39,7 @@ namespace ReallifeGamemode.Server.Managers LoadDoors(); } - public static void ChangeDoorState(Client player) + public static void ChangeDoorState(Player player) { var user = player.GetUser(); @@ -68,7 +68,7 @@ namespace ReallifeGamemode.Server.Managers } [ServerEvent(Event.PlayerEnterColshape)] - public void DoorManagerPlayerEnterColShapeEvent(ColShape colShape, Client player) + public void DoorManagerPlayerEnterColShapeEvent(ColShape colShape, Player player) { if (_doorColShapes.ContainsValue(colShape.Handle)) { diff --git a/ReallifeGamemode.Server/Managers/HouseManager.cs b/ReallifeGamemode.Server/Managers/HouseManager.cs index 39416ecd..af20079b 100644 --- a/ReallifeGamemode.Server/Managers/HouseManager.cs +++ b/ReallifeGamemode.Server/Managers/HouseManager.cs @@ -12,14 +12,14 @@ using System.Text; namespace ReallifeGamemode.Server.Managers { - class HouseManager : Script + class HouseManager { private static readonly Dictionary houseMarkers = new Dictionary(); private static readonly Dictionary houseLabels = new Dictionary(); private static readonly Dictionary houseColShapes = new Dictionary(); private static readonly Dictionary houseBlips = new Dictionary(); - private static readonly Dictionary> playerInColShape = new Dictionary>(); + private static readonly Dictionary> playerInColShape = new Dictionary>(); public static async void LoadHouses() { @@ -99,7 +99,7 @@ namespace ReallifeGamemode.Server.Managers { if (loadUser) house = house.Refresh(); - playerInColShape[house.Id] = new List(); + playerInColShape[house.Id] = new List(); 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())}"; @@ -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 (!houseColShapes.ContainsValue(colShape.Handle)) @@ -140,7 +140,7 @@ namespace ReallifeGamemode.Server.Managers 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 (!houseColShapes.ContainsValue(colShape.Handle)) @@ -153,10 +153,10 @@ namespace ReallifeGamemode.Server.Managers User user = client.GetUser(); 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(); var userHouseStatus = -1; @@ -208,14 +208,14 @@ namespace ReallifeGamemode.Server.Managers houseBlips.Remove(house.Id); } - foreach (Client client in playerInColShape[house.Id]) + foreach (Player client in playerInColShape[house.Id]) { client.TriggerEvent("SERVER:CloseHouseMenu"); } } [RemoteEvent("CLIENT:House_BuyHouse")] - public void HouseManagerBuyHouseEvent(Client player) + public void HouseManagerBuyHouseEvent(Player player) { using (var dbContext = new DatabaseContext()) { @@ -250,7 +250,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("CLIENT:House_SetRentalFee")] - public void HouseManagerSetRentalFeeEvent(Client player, int rentalFee) + public void HouseManagerSetRentalFeeEvent(Player player, int rentalFee) { using (var dbContext = new DatabaseContext()) { @@ -276,7 +276,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("CLIENT:House_CancelUserRental")] - public void HouseManagerCancelUserRentalEvent(Client player, string userName) + public void HouseManagerCancelUserRentalEvent(Player player, string userName) { using (var dbContext = new DatabaseContext()) { @@ -306,15 +306,15 @@ namespace ReallifeGamemode.Server.Managers dbContext.HouseRentals.Remove(rental); 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."); - SendClientHouseData(player, house); + SendPlayerHouseData(player, house); } } [RemoteEvent("CLIENT:House_RentInHouse")] - public void HouseManagerRentInHouseEvent(Client player) + public void HouseManagerRentInHouseEvent(Player player) { using (var dbContext = new DatabaseContext()) { @@ -340,12 +340,12 @@ namespace ReallifeGamemode.Server.Managers player.SendNotification("~g~Du hast dich in das 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")] - public void HouseManagerCancelOwnRentalEvent(Client player) + public void HouseManagerCancelOwnRentalEvent(Player player) { using (var dbContext = new DatabaseContext()) { @@ -376,12 +376,12 @@ namespace ReallifeGamemode.Server.Managers RemoveHouse(house); LoadHouse(house); - SendClientHouseData(player, house); + SendPlayerHouseData(player, house); } } [RemoteEvent("CLIENT:House_SellHouse")] - public void HouseManagerSellHouseEvent(Client player) + public void HouseManagerSellHouseEvent(Player player) { using (var dbContext = new DatabaseContext()) { @@ -404,7 +404,7 @@ namespace ReallifeGamemode.Server.Managers RemoveHouse(house); LoadHouse(house); - SendClientHouseData(player, house); + SendPlayerHouseData(player, house); } } } diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 3f2f2828..ee57ae6f 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -27,7 +27,7 @@ namespace ReallifeGamemode.Server.Managers #endregion #region Eigeninteraktionen PFEILTASTE-RUNTER [RemoteEvent("CLIENT:InteractionMenu_AcceptInvite")] - public void InteractionMenuAcceptInvite(Client player, string type) + public void InteractionMenuAcceptInvite(Player player, string type) { if (type != "Fraktion" && type != "Gruppe") return; @@ -39,7 +39,7 @@ namespace ReallifeGamemode.Server.Managers return; } - Client leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_faction_invite")); + Player leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_faction_invite")); player.ResetData("accept_faction_invite"); if (leader == null) @@ -91,7 +91,7 @@ namespace ReallifeGamemode.Server.Managers return; } - Client leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_group_invite")); + Player leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData("accept_group_invite")); player.ResetData("accept_group_invite"); if (leader == null) @@ -116,18 +116,18 @@ namespace ReallifeGamemode.Server.Managers } } [RemoteEvent("CLIENT:InteractionMenu_EndShow")] - public void InteractionMenuEndShow(Client client) + public void InteractionMenuEndShow(Player client) { client.ResetData("ShowActive"); } [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") return; - Client target = ClientService.GetClientByNameOrId(nameOrId); + Player target = PlayerService.GetPlayerByNameOrId(nameOrId); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -163,11 +163,11 @@ namespace ReallifeGamemode.Server.Managers } [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; - Client target = ClientService.GetClientByNameOrId(nameOrId); + Player target = PlayerService.GetPlayerByNameOrId(nameOrId); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -220,11 +220,11 @@ namespace ReallifeGamemode.Server.Managers } [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; - Client target = ClientService.GetClientByNameOrId(name); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(player); @@ -313,7 +313,7 @@ namespace ReallifeGamemode.Server.Managers } [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(); @@ -336,27 +336,27 @@ namespace ReallifeGamemode.Server.Managers #endregion #region Spielerinteraktionen PFEILTASTE-LINKS [RemoteEvent("openTradeInventory")] - public void OpenTradeInventory(Client player, string targetPlayer) + public void OpenTradeInventory(Player player, string targetPlayer) { InventoryManager.GetUserItems(player); player.TriggerEvent("openTradeMenu", targetPlayer); } [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(tradeItemArray); - Client tradePartner = ClientService.GetClientByNameOrId(tradePartnerName); + Player tradePartner = PlayerService.GetPlayerByNameOrId(tradePartnerName); InventoryManager.GetUserItems(player); tradePartner.TriggerEvent("showTradeRequest", player.Name, tradeItems, tradePrize); player.TriggerEvent("startTradeRequestTimer"); } [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(tradeItemArray); - Client tradeRequester = ClientService.GetClientByNameOrId(tradeRequesterName); + Player tradeRequester = PlayerService.GetPlayerByNameOrId(tradeRequesterName); if (tradeSelection == "accept") { if (player.GetUser().Handmoney < tradePrize) diff --git a/ReallifeGamemode.Server/Managers/InteriorManager.cs b/ReallifeGamemode.Server/Managers/InteriorManager.cs index 0583c21b..67891bd5 100644 --- a/ReallifeGamemode.Server/Managers/InteriorManager.cs +++ b/ReallifeGamemode.Server/Managers/InteriorManager.cs @@ -110,7 +110,7 @@ namespace ReallifeGamemode.Server.Managers public static int GetInteriorIdFromExitColShape(NetHandle handle) => _interiorExitColShapes.FirstOrDefault(c => c.Value.Value == handle.Value).Key; [ServerEvent(Event.PlayerEnterColshape)] - public void InteriorManagerPlayerEnterColshapeEvent(ColShape colShape, Client player) + public void InteriorManagerPlayerEnterColshapeEvent(ColShape colShape, Player player) { int enterId = GetInteriorIdFromEnterColShape(colShape); int exitId = GetInteriorIdFromExitColShape(colShape); @@ -127,7 +127,7 @@ namespace ReallifeGamemode.Server.Managers } [ServerEvent(Event.PlayerExitColshape)] - public void InteriorManagerPlayerExitColshapeEvent(ColShape colShape, Client player) + public void InteriorManagerPlayerExitColshapeEvent(ColShape colShape, Player player) { if (GetInteriorIdFromEnterColShape(colShape) != 0 || GetInteriorIdFromExitColShape(colShape) != 0) { @@ -136,7 +136,7 @@ namespace ReallifeGamemode.Server.Managers } [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); player.Position = enterExit == 0 ? interior.ExitPosition : interior.EnterPosition; diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index 05c27955..ee75659c 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -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 inventoryWeight = 0; @@ -106,7 +106,7 @@ namespace ReallifeGamemode.Server.Managers iId.Add(iItem.Id); } - List targetList = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player); + List targetList = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player); List username = new List(); 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 inventoryWeight = 0; @@ -157,7 +157,7 @@ namespace ReallifeGamemode.Server.Managers return inventoryWeight; } - public static UserItem UserHasThisItem(Client player, int itemId) + public static UserItem UserHasThisItem(Player player, int itemId) { var user = player.GetUser(); 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; @@ -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(jsonOrigin); var itemID = JsonConvert.DeserializeObject(jsonItemID); @@ -359,7 +359,7 @@ namespace ReallifeGamemode.Server.Managers } [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(jsonItemID); var itemAmount = JsonConvert.DeserializeObject(jsonItemAmount); @@ -400,7 +400,7 @@ namespace ReallifeGamemode.Server.Managers [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(); @@ -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(); 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(); using (var context = new DatabaseContext()) @@ -525,13 +525,13 @@ namespace ReallifeGamemode.Server.Managers } [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()) { UserItem fItem = context.UserItems.FirstOrDefault(j => j.Id == int.Parse(userItemId)); - Client targetPlayer = ClientService.GetClientByNameOrId(targetPlayerName); + Player targetPlayer = PlayerService.GetPlayerByNameOrId(targetPlayerName); if (amount == "stack") { @@ -550,7 +550,7 @@ namespace ReallifeGamemode.Server.Managers } [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(jsonAmount); int itemId = JsonConvert.DeserializeObject(jsonItemId); @@ -602,7 +602,7 @@ namespace ReallifeGamemode.Server.Managers 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); Random r = new Random(); GTANetworkAPI.Object grndObject; @@ -638,11 +638,11 @@ namespace ReallifeGamemode.Server.Managers [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(); string nameOrId = JsonConvert.DeserializeObject(jsonNameOrId); - Client target = ClientService.GetClientByNameOrId(nameOrId); + Player target = PlayerService.GetPlayerByNameOrId(nameOrId); if (target == null || !target.IsLoggedIn() || target == client) { ChatService.PlayerNotFound(client); @@ -658,7 +658,7 @@ namespace ReallifeGamemode.Server.Managers List itemNameList = new List(); - if (target.HasData("inTrade") && target.GetData("inTrade") == true) + if (target.HasData("inTrade") && target.GetData("inTrade") == true) { ChatService.SendMessage(client, $"~r~[FEHLER] ~w~{target.Name} befindet sich bereits in einem Handel."); return; @@ -710,7 +710,7 @@ namespace ReallifeGamemode.Server.Managers 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); 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)); }; } - public void SendBackToSender(Client client) + public void SendBackToSender(Player client) { User user = client.GetUser(); ChatService.SendMessage(client, "Dein Handelspartner hat die Anfrage nicht angenommen."); @@ -759,16 +759,16 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("declineTrade")] - public void ServerEvent_declineTrade(Client client) + public void ServerEvent_declineTrade(Player client) { client.SetSharedData("tradeOffer", JsonConvert.SerializeObject(0)); - if (!client.GetData("inTrade")) + if (!client.GetData("inTrade")) { ChatService.ErrorMessage(client, "Das Handelsangebot ist abgelaufen."); return; } - string name = client.GetData("trade"); - Client target = ClientService.GetClientByNameOrId(name); + string name = client.GetData("trade"); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(client); @@ -780,10 +780,10 @@ namespace ReallifeGamemode.Server.Managers SendBackToSender(target); } - public static void OpenTradeAccept(Client client) + public static void OpenTradeAccept(Player client) { User user = client.GetUser(); - int id = client.GetData("tradePartner"); + int id = client.GetData("tradePartner"); (int[] itemIdArr, int[] itemAmountArr) = TradeItems[id]; Timer tradeTimer = TradeTimer[id]; tradeTimer.Stop(); @@ -792,9 +792,9 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("acceptTrade")] - public void ServerEvent_AcceptTrade(Client client) + public void ServerEvent_AcceptTrade(Player client) { - if (!client.GetData("inTrade")) + if (!client.GetData("inTrade")) { ChatService.ErrorMessage(client, "Das Handelsangebot ist abgelaufen."); return; @@ -803,12 +803,12 @@ namespace ReallifeGamemode.Server.Managers client.SetData("inTrade", false); User user = client.GetUser(); - int id = client.GetData("tradePartner"); + int id = client.GetData("tradePartner"); (int[] itemIdArr, int[] itemAmountArr) = TradeItems[id]; Timer tradeTimer = TradeTimer[id]; tradeTimer.Stop(); - string name = client.GetData("trade"); - Client target = ClientService.GetClientByNameOrId(name); + string name = client.GetData("trade"); + Player target = PlayerService.GetPlayerByNameOrId(name); if (target == null || !target.IsLoggedIn()) { ChatService.PlayerNotFound(client); @@ -865,7 +865,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("SERVER:BuyItems")] - public void SrvEvent_BuyItem(Client client, string itemName) + public void SrvEvent_BuyItem(Player client, string itemName) { IItem shopItem = GetItemByName(itemName); diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index eb7e13fc..0c8f41a5 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -46,7 +46,7 @@ namespace ReallifeGamemode.Server.Managers public static List GetJobs() => _jobs.OrderBy(j => j.Id).ToList(); [RemoteEvent("CLIENT:JobCenter_CancelJob")] - public void CancelJobEvent(Client player) + public void CancelJobEvent(Player player) { using (var dbContext = new DatabaseContext()) { @@ -69,7 +69,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("CLIENT:JobCenter_AcceptJob")] - public void AcceptJobEvent(Client player, int jobId) + public void AcceptJobEvent(Player player, int jobId) { using (var dbContext = new DatabaseContext()) { @@ -100,7 +100,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("CLIENT:JobManager_ShowJobMenu")] - public void ShowJobMenuEvent(Client player) + public void ShowJobMenuEvent(Player player) { User u = player.GetUser(); @@ -153,7 +153,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("CLIENT:Job_StartJob")] - public void StartJobEvent(Client player) + public void StartJobEvent(Player player) { User u = player.GetUser(); @@ -177,7 +177,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("CLIENT:Job_StopJob")] - public void StopJob(Client player) + public void StopJob(Player player) { User u = player.GetUser(); @@ -200,7 +200,7 @@ namespace ReallifeGamemode.Server.Managers } [ServerEvent(Event.PlayerExitVehicle)] - public void JobManagerPlayerExitVehicle(Client player, Vehicle veh) + public void JobManagerPlayerExitVehicle(Player player, Vehicle veh) { User u = player.GetUser(); @@ -216,7 +216,7 @@ namespace ReallifeGamemode.Server.Managers } [ServerEvent(Event.PlayerEnterVehicle)] - public void JobManagerPlayerEnterVehicle(Client player, Vehicle veh, sbyte seat) + public void JobManagerPlayerEnterVehicle(Player player, Vehicle veh, sbyte seat) { ServerVehicle sVeh = veh.GetServerVehicle(); if (sVeh == null) return; @@ -230,7 +230,7 @@ namespace ReallifeGamemode.Server.Managers var contract = taxiContracts.First(); taxiJob.TaxiContracts.Remove(contract); - Client driver = veh.GetDriver(); + Player driver = veh.GetDriver(); if (driver != null && contract.Driver.Handle != veh.GetDriver().Handle) { @@ -241,7 +241,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("CLIENT:JobManager_TaxiJob_AcceptCall")] - public void TaxiJobAcceptCall(Client player, string name) + public void TaxiJobAcceptCall(Player player, string name) { var taxiJob = JobManager.GetJob(); @@ -253,7 +253,7 @@ namespace ReallifeGamemode.Server.Managers var job = taxiJob.TaxiContracts.Where(t => t.Name == name).First(); - var target = ClientService.GetClientByNameOrId(name); + var target = PlayerService.GetPlayerByNameOrId(name); if (target == null) { taxiJob.TaxiContracts.Remove(job); diff --git a/ReallifeGamemode.Server/Managers/SaveManager.cs b/ReallifeGamemode.Server/Managers/SaveManager.cs index f93747e5..ce490fd1 100644 --- a/ReallifeGamemode.Server/Managers/SaveManager.cs +++ b/ReallifeGamemode.Server/Managers/SaveManager.cs @@ -12,7 +12,7 @@ namespace ReallifeGamemode.Server.Managers { [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) { 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()) { @@ -207,7 +207,7 @@ namespace ReallifeGamemode.Server.Managers using (var saveAll = new DatabaseContext()) { //Alle Spieler - foreach (Client player in NAPI.Pools.GetAllPlayers()) + foreach (Player player in NAPI.Pools.GetAllPlayers()) { Vector3 pos = player.Position; User user = player.GetUser(saveAll); diff --git a/ReallifeGamemode.Server/Managers/TuningManager.cs b/ReallifeGamemode.Server/Managers/TuningManager.cs index 0f96f874..39501e76 100644 --- a/ReallifeGamemode.Server/Managers/TuningManager.cs +++ b/ReallifeGamemode.Server/Managers/TuningManager.cs @@ -79,7 +79,7 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("startPlayerTuning")] - public void StartPlayerTuning(Client player) + public void StartPlayerTuning(Player player) { if (!player.IsInVehicle) return; @@ -87,14 +87,14 @@ namespace ReallifeGamemode.Server.Managers } [RemoteEvent("repairVehicle")] - public void RepairVehicle(Client player) + public void RepairVehicle(Player player) { if (!player.IsInVehicle) return; player.Vehicle.Repair(); } [RemoteEvent("setVehicleMod")] - public void SetVehicleMod(Client player, int slot, int index) + public void SetVehicleMod(Player player, int slot, int index) { Vehicle pV = player.Vehicle; if (index == 0) index--; diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index 17ed96b7..8a6eed6b 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -747,7 +747,7 @@ namespace ReallifeGamemode.Server.Managers double distanceDriven; try { - distanceDriven = v.HasSharedData("drivenDistance") ? (double)v.GetSharedData("drivenDistance") : 0D; + distanceDriven = v.HasSharedData("drivenDistance") ? (double)v.GetSharedData("drivenDistance") : 0D; } catch (Microsoft.CSharp.RuntimeBinder.RuntimeBinderException) { @@ -770,13 +770,14 @@ namespace ReallifeGamemode.Server.Managers foreach (var key in lastPositions.Keys.ToList()) { Vehicle v = key.Entity(); + if (v == null) continue; if (!v.HasSharedData("drivenDistance")) continue; ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(v, dbContext); if (sVeh == null) continue; - sVeh.DistanceDriven = (float)v.GetSharedData("drivenDistance"); + sVeh.DistanceDriven = (float)v.GetSharedData("drivenDistance"); } dbContext.SaveChanges(); diff --git a/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.Designer.cs b/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.Designer.cs index 5b3cac64..f8b7564a 100644 --- a/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.Designer.cs +++ b/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.Designer.cs @@ -9,8 +9,8 @@ using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Database.Migrations { [DbContext(typeof(DatabaseContext))] - [Migration("20190625202943_ClientWanteds")] - partial class ClientWanteds + [Migration("20190625202943_PlayerWanteds")] + partial class PlayerWanteds { protected override void BuildTargetModel(ModelBuilder modelBuilder) { diff --git a/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.cs b/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.cs index a0b86ca2..41c8a46e 100644 --- a/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.cs +++ b/ReallifeGamemode.Server/Migrations/20190625202943_ClientWanteds.cs @@ -2,7 +2,7 @@ namespace ReallifeGamemode.Database.Migrations { - public partial class ClientWanteds : Migration + public partial class PlayerWanteds : Migration { protected override void Up(MigrationBuilder migrationBuilder) { diff --git a/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj b/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj index e1786580..b7a1737d 100644 --- a/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj +++ b/ReallifeGamemode.Server/ReallifeGamemode.Server.csproj @@ -1,6 +1,6 @@  - netcoreapp2.0 + netcoreapp3.1 ReallifeGamemode.Server true true @@ -22,6 +22,7 @@ + diff --git a/ReallifeGamemode.Server/Report/Report.cs b/ReallifeGamemode.Server/Report/Report.cs index c3a31c7e..c21d40d7 100644 --- a/ReallifeGamemode.Server/Report/Report.cs +++ b/ReallifeGamemode.Server/Report/Report.cs @@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Report public static List listReports = new List(); [Command("report", "~m~Benutzung: ~s~/report")] - public void CmdUserReport(Client client) + public void CmdUserReport(Player client) { User user = client.GetUser(); @@ -30,7 +30,7 @@ namespace ReallifeGamemode.Server.Report } [Command("showtickets", "~m~Benutzung: ~s~/showtickets")] - public void CmdAdminShowtickets(Client client) + public void CmdAdminShowtickets(Player client) { if (!client.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) { @@ -68,9 +68,9 @@ namespace ReallifeGamemode.Server.Report [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) return; @@ -103,7 +103,7 @@ namespace ReallifeGamemode.Server.Report } [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; String username = "N/A"; @@ -124,10 +124,10 @@ namespace ReallifeGamemode.Server.Report break; } } - Client user = null; + Player user = null; if (cont) { - user = ClientService.GetClientByNameOrId(username); + user = PlayerService.GetPlayerByNameOrId(username); if (text.Equals("quit")) { @@ -174,14 +174,14 @@ namespace ReallifeGamemode.Server.Report { return; } - Client admin = ClientService.GetClientByNameOrId(adminname); + Player admin = PlayerService.GetPlayerByNameOrId(adminname); ChatService.SendMessage(admin, "!{#008fff}[REPORT]!{#FFFFFF} " + client.Name + ": " + text); ChatService.SendMessage(client, "!{#008fff}[REPORT]!{#FFFFFF} " + client.Name + ": " + text); } } [RemoteEvent("requestReport")] - public void RequestReport(Client user, string type, string data) + public void RequestReport(Player user, string type, string data) { string text = JsonConvert.DeserializeObject(data); if (type == "Ticket Report") @@ -213,9 +213,9 @@ namespace ReallifeGamemode.Server.Report } [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) return; diff --git a/ReallifeGamemode.Server/Services/ChatService.cs b/ReallifeGamemode.Server/Services/ChatService.cs index abf257b4..5ade5fbe 100644 --- a/ReallifeGamemode.Server/Services/ChatService.cs +++ b/ReallifeGamemode.Server/Services/ChatService.cs @@ -19,22 +19,22 @@ namespace ReallifeGamemode.Server.Services { class ChatService { - public static void NotAuthorized(Client player) + public static void NotAuthorized(Player player) { 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"); } - public static void ErrorMessage(Client player, string message) + public static void ErrorMessage(Player player, string message) { 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; player.SendChatMessage(message); @@ -49,7 +49,7 @@ namespace ReallifeGamemode.Server.Services /// Die Liste an Fraktionen, die diese Nachricht bekommen sollen public static void BroadcastFaction(string message, List factions) { - foreach (Client c in NAPI.Pools.GetAllPlayers()) + foreach (Player c in NAPI.Pools.GetAllPlayers()) { Faction f = c.GetUser()?.Faction; if (f != null) @@ -94,7 +94,7 @@ namespace ReallifeGamemode.Server.Services } public static void BroadcastDutyAdmin(string message) { - foreach (Client admin in GlobalHelper.DutyAdmins) + foreach (Player admin in GlobalHelper.DutyAdmins) { ChatService.SendMessage(admin, message); } diff --git a/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs b/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs index 7d629b63..df355fa9 100644 --- a/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs +++ b/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs @@ -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; List tops = clotheList.ToList().FindAll(c => c.Gender == gender && c.ComponentId == 11); diff --git a/ReallifeGamemode.Server/Shop/SevenEleven/ItemShop.cs b/ReallifeGamemode.Server/Shop/SevenEleven/ItemShop.cs index 2b7aa4c1..b2502396 100644 --- a/ReallifeGamemode.Server/Shop/SevenEleven/ItemShop.cs +++ b/ReallifeGamemode.Server/Shop/SevenEleven/ItemShop.cs @@ -30,7 +30,7 @@ namespace ReallifeGamemode.Server.Shop.SevenEleven shopItems = dbContext.ShopItems.ToList().FindAll(i => i.ShopId == id); } } - public void LoadShopNUI(Client client) + public void LoadShopNUI(Player client) { List itemList = shopItems.ToList().FindAll(s => s.Amount > 0); List items = new List(); diff --git a/ReallifeGamemode.Server/Util/CheckPointHandle.cs b/ReallifeGamemode.Server/Util/CheckPointHandle.cs index 0b0c8267..40ff99e7 100644 --- a/ReallifeGamemode.Server/Util/CheckPointHandle.cs +++ b/ReallifeGamemode.Server/Util/CheckPointHandle.cs @@ -8,13 +8,13 @@ namespace ReallifeGamemode.Server.Util { public static List listHandle = new List(); - public static void DeleteCheckpoints(Client player) + public static void DeleteCheckpoints(Player player) { RemovePlayerHandlerFromList(player); player.TriggerEvent("destroyCP"); } - public static void StartCheckPointRoute(Client player, IEnumerable nListCps, int delay, int markerID, int markerSize, string nEvent) + public static void StartCheckPointRoute(Player player, IEnumerable nListCps, int delay, int markerID, int markerSize, string nEvent) { RemovePlayerHandlerFromList(player); CheckPointListForPlayer playerHandle = new CheckPointListForPlayer(player, nListCps, delay, markerID, markerSize, nEvent); @@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Util playerHandle.StartRoute(); } - public static void RemovePlayerHandlerFromList(Client player) + public static void RemovePlayerHandlerFromList(Player player) { CheckPointListForPlayer temp = null; for (int a = 0; a < listHandle.Count; a++) @@ -38,7 +38,7 @@ namespace ReallifeGamemode.Server.Util } [RemoteEvent("playerInCheckpoint")] - public void PlayerInCheckpoint(Client user) + public void PlayerInCheckpoint(Player user) { CheckPointListForPlayer temp = null; for (int a = 0; a < listHandle.Count; a++) @@ -56,7 +56,7 @@ namespace ReallifeGamemode.Server.Util public class CheckPointListForPlayer { public IEnumerable list = new List(); - public Client player; + public Player player; public int delay = 0; public int markerID; public int markerSize; @@ -64,7 +64,7 @@ namespace ReallifeGamemode.Server.Util int checkPointsDone = 0; - public CheckPointListForPlayer(Client nPlayer, IEnumerable nList, int nDelay, int nMarkerID, int nMarkerSize, string nEvent) + public CheckPointListForPlayer(Player nPlayer, IEnumerable nList, int nDelay, int nMarkerID, int nMarkerSize, string nEvent) { this.player = nPlayer; this.list = nList; diff --git a/ReallifeGamemode.Server/Util/GlobalHelper.cs b/ReallifeGamemode.Server/Util/GlobalHelper.cs index 0d6e053c..1f5c7282 100644 --- a/ReallifeGamemode.Server/Util/GlobalHelper.cs +++ b/ReallifeGamemode.Server/Util/GlobalHelper.cs @@ -8,8 +8,8 @@ namespace ReallifeGamemode.Server.Util { public static class GlobalHelper { - public static List DutyAdmins = new List(); - public static List tsupAdmins = new List(); + public static List DutyAdmins = new List(); + public static List tsupAdmins = new List(); public static Dictionary CustomJoinMessages = new Dictionary { diff --git a/ReallifeGamemode.Server/Util/SmoothThrottle.cs b/ReallifeGamemode.Server/Util/SmoothThrottle.cs index 0da8c2ab..7b3fcbf0 100644 --- a/ReallifeGamemode.Server/Util/SmoothThrottle.cs +++ b/ReallifeGamemode.Server/Util/SmoothThrottle.cs @@ -1,17 +1,17 @@ -using GTANetworkAPI; +using GTANetworkAPI; namespace ReallifeGamemode.Server.Util { public class SmoothThrottleAntiReverse : Script { [ServerEvent(Event.PlayerExitVehicle)] - public void SmoothThrottleExitEvent(Client player, Vehicle veh) + public void SmoothThrottleExitEvent(Player player, Vehicle veh) { NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_PlayerExitVehicle", veh); } [ServerEvent(Event.PlayerEnterVehicle)] - public void SmoothThrottleEnterEvent(Client player, Vehicle veh, sbyte seat) + public void SmoothThrottleEnterEvent(Player player, Vehicle veh, sbyte seat) { NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_PlayerEnterVehicle", veh, seat); } @@ -20,21 +20,21 @@ namespace ReallifeGamemode.Server.Util //Note that these are toggles, you only need to call them once. //This disables/enables the smooth throttle - public static void SetSmoothThrottle(Client player, bool turnedOn) + public static void SetSmoothThrottle(Player player, bool turnedOn) { NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_SetSmoothThrottle", turnedOn); } //This disables/enables anti reverse - public static void SetAntiReverse(Client player, bool turnedOn) + public static void SetAntiReverse(Player player, bool turnedOn) { NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_SetAntiReverse", turnedOn); } //This disables/enables both - public static void SetSmoothThrottleAntiReverse(Client player, bool turnedOn) + public static void SetSmoothThrottleAntiReverse(Player player, bool turnedOn) { NAPI.ClientEvent.TriggerClientEvent(player, "SmoothThrottle_SetGlobal", turnedOn); } } -} \ No newline at end of file +} diff --git a/ReallifeGamemode.Server/Util/TaxiContract.cs b/ReallifeGamemode.Server/Util/TaxiContract.cs index a7528ec4..c96b5e37 100644 --- a/ReallifeGamemode.Server/Util/TaxiContract.cs +++ b/ReallifeGamemode.Server/Util/TaxiContract.cs @@ -11,6 +11,6 @@ namespace ReallifeGamemode.Server.Util public Vector3 Position { get; set; } - public Client Driver { get; set; } + public Player Driver { get; set; } } } diff --git a/ReallifeGamemode.Server/Util/VehicleSync.cs b/ReallifeGamemode.Server/Util/VehicleSync.cs index 449da6df..85c875ec 100644 --- a/ReallifeGamemode.Server/Util/VehicleSync.cs +++ b/ReallifeGamemode.Server/Util/VehicleSync.cs @@ -233,12 +233,12 @@ namespace ReallifeGamemode.Server.Util { if (NAPI.Entity.DoesEntityExist(veh)) { - if (NAPI.Data.HasEntitySharedData(veh.Handle, "VehicleSyncData")) + if (NAPI.Data.HasEntitySharedData(veh, "VehicleSyncData")) { try { //API converts class objects to JObject so we have to change it back - JObject obj = NAPI.Data.GetEntitySharedData(veh.Handle, "VehicleSyncData"); + JObject obj = (JObject)NAPI.Data.GetEntitySharedData(veh, "VehicleSyncData"); return obj.ToObject(); } catch (Exception) { return null; } @@ -285,7 +285,7 @@ namespace ReallifeGamemode.Server.Util //Called from the client to sync dirt level [RemoteEvent("VehStream_SetDirtLevel")] - public void VehStreamSetDirtLevel(Client player, Vehicle veh, float dirt) + public void VehStreamSetDirtLevel(Player player, Vehicle veh, float dirt) { VehicleSyncData data = GetVehicleSyncData(veh); if (data == default(VehicleSyncData)) @@ -301,7 +301,7 @@ namespace ReallifeGamemode.Server.Util //Called from the client to sync door data [RemoteEvent("VehStream_SetDoorData")] - public void VehStreamSetDoorData(Client player, Vehicle veh, int door1state, int door2state, int door3state, int door4state, int door5state, int door6state, int door7state, int door8state) + public void VehStreamSetDoorData(Player player, Vehicle veh, int door1state, int door2state, int door3state, int door4state, int door5state, int door6state, int door7state, int door8state) { VehicleSyncData data = GetVehicleSyncData(veh); if (data == default(VehicleSyncData)) @@ -324,7 +324,7 @@ namespace ReallifeGamemode.Server.Util //Called from the client to sync window data [RemoteEvent("VehStream_SetWindowData")] - public void VehStreamSetWindowData(Client player, Vehicle veh, int window1state, int window2state, int window3state, int window4state) + public void VehStreamSetWindowData(Player player, Vehicle veh, int window1state, int window2state, int window3state, int window4state) { VehicleSyncData data = GetVehicleSyncData(veh); if (data == default(VehicleSyncData)) @@ -343,7 +343,7 @@ namespace ReallifeGamemode.Server.Util //Called from the client to sync wheel data [RemoteEvent("VehStream_SetWheelData")] - public void VehStreamSetWheelData(Client player, Vehicle veh, int wheel1state, int wheel2state, int wheel3state, int wheel4state, int wheel5state, int wheel6state, int wheel7state, int wheel8state, int wheel9state, int wheel10state) + public void VehStreamSetWheelData(Player player, Vehicle veh, int wheel1state, int wheel2state, int wheel3state, int wheel4state, int wheel5state, int wheel6state, int wheel7state, int wheel8state, int wheel9state, int wheel10state) { VehicleSyncData data = GetVehicleSyncData(veh); if (data == default(VehicleSyncData)) @@ -367,7 +367,7 @@ namespace ReallifeGamemode.Server.Util //Other events [ServerEvent(Event.PlayerEnterVehicleAttempt)] - public void VehStreamEnterAttempt(Client player, Vehicle veh, sbyte seat) + public void VehStreamEnterAttempt(Player player, Vehicle veh, sbyte seat) { VehicleSyncData data = GetVehicleSyncData(veh); if (data == default(VehicleSyncData)) @@ -378,10 +378,10 @@ namespace ReallifeGamemode.Server.Util } [ServerEvent(Event.PlayerExitVehicleAttempt)] - public void VehStreamExitAttempt(Client player, Vehicle veh) + public void VehStreamExitAttempt(Player player, Vehicle veh) { - if (player.HasData("isDead") && player.GetData("isDead")) + if (player.HasData("isDead") && player.GetData("isDead")) return; @@ -397,9 +397,9 @@ namespace ReallifeGamemode.Server.Util } [ServerEvent(Event.PlayerExitVehicle)] - public void VehStreamExit(Client player, Vehicle veh) + public void VehStreamExit(Player player, Vehicle veh) { - if (player.HasData("isDead") && player.GetData("isDead")) + if (player.HasData("isDead") && player.GetData("isDead")) return; VehicleSyncData data = GetVehicleSyncData(veh); @@ -414,7 +414,7 @@ namespace ReallifeGamemode.Server.Util } [ServerEvent(Event.PlayerEnterVehicle)] - public void VehStreamEnter(Client player, Vehicle veh, sbyte seat) + public void VehStreamEnter(Player player, Vehicle veh, sbyte seat) { VehicleSyncData data = GetVehicleSyncData(veh); if (data == default(VehicleSyncData)) @@ -437,7 +437,7 @@ namespace ReallifeGamemode.Server.Util // UpdateVehicleSyncData(veh, data); - // if (NAPI.Vehicle.GetVehicleDriver(veh) != default(Client)) //Doesn't work? + // if (NAPI.Vehicle.GetVehicleDriver(veh) != default(Player)) //Doesn't work? // NAPI.ClientEvent.TriggerClientEvent(NAPI.Vehicle.GetVehicleDriver(veh), "VehStream_PlayerExitVehicleAttempt", veh); //} @@ -458,12 +458,12 @@ namespace ReallifeGamemode.Server.Util // INDICATORS [RemoteEvent("CLIENT:toggleLeftIndicator")] - public void ToggleLeftIndicator(Client player) + public void ToggleLeftIndicator(Player player) { - if (!player.IsInVehicle || player.VehicleSeat != -1) return; + if (!player.IsInVehicle || player.VehicleSeat != 0) return; Vehicle veh = player.Vehicle; - if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData(); + if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData(); if (data.Left && data.Right) { @@ -480,12 +480,12 @@ namespace ReallifeGamemode.Server.Util } [RemoteEvent("CLIENT:toggleRightIndicator")] - public void ToggleRightIndicator(Client player) + public void ToggleRightIndicator(Player player) { - if (!player.IsInVehicle || player.VehicleSeat != -1) return; + if (!player.IsInVehicle || player.VehicleSeat != 0) return; Vehicle veh = player.Vehicle; - if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData(); + if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData(); if (data.Left && data.Right) { @@ -502,12 +502,12 @@ namespace ReallifeGamemode.Server.Util } [RemoteEvent("CLIENT:toggleWarningIndicator")] - public void ToggleWarningIndicator(Client player) + public void ToggleWarningIndicator(Player player) { - if (!player.IsInVehicle || player.VehicleSeat != -1) return; + if (!player.IsInVehicle || player.VehicleSeat != 0) return; Vehicle veh = player.Vehicle; - if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData(); + if (!(veh.GetData("indicatorData") is IndicatorData data)) data = new IndicatorData(); if (data.Right && data.Left) { diff --git a/ReallifeGamemode.Server/Wanted/Autowanted.cs b/ReallifeGamemode.Server/Wanted/Autowanted.cs index b83d71b8..420f7cb8 100644 --- a/ReallifeGamemode.Server/Wanted/Autowanted.cs +++ b/ReallifeGamemode.Server/Wanted/Autowanted.cs @@ -10,7 +10,7 @@ namespace ReallifeGamemode.Server.Wanted { 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(); if (killer.FactionId == 1 || killer.FactionId == 3) diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs index 96e0d614..1cd10028 100644 --- a/ReallifeGamemode.Server/Wanted/Jail.cs +++ b/ReallifeGamemode.Server/Wanted/Jail.cs @@ -17,7 +17,7 @@ namespace ReallifeGamemode.Server.Wanted private static Dictionary Jailtime { get; set; } = new Dictionary(); //time in seconds - public static void Check_PutBehindBars(Client client) + public static void Check_PutBehindBars(Player client) { User user = client.GetUser(); if (user.JailTime > 0) @@ -38,17 +38,18 @@ namespace ReallifeGamemode.Server.Wanted } if (user.Wanteds <= 0) 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) { int jailTime = user.Wanteds * 54; - if (cop.GetData("duty") && copClient.Position.DistanceTo2D(client.Position) <= 200 && (!copClient.HasData("isDead") || copClient.GetData("isDead") != true)) + if (cop.GetData("duty") && copPlayer.Position.DistanceTo2D(client.Position) <= 200 && (!copPlayer.HasData("isDead") || copPlayer.GetData("isDead") != true)) { using (var dbContext = new DatabaseContext()) { - if (!client.HasData("isDead") || client.GetData("isDead") == false) + if (!client.HasData("isDead") || client.GetData("isDead") == false) { jailTime /= 2; } @@ -135,8 +136,9 @@ namespace ReallifeGamemode.Server.Wanted { foreach (var copPlayer in NAPI.Pools.GetAllPlayers()) { + if (!copPlayer.IsLoggedIn()) return; User cop = copPlayer.GetUser(); - if (cop.GetData("duty") && copPlayer.Position.DistanceTo2D(player.Position) <= 500 && (!copPlayer.HasData("isDead") || copPlayer.GetData("isDead") != true)) + if (cop.GetData("duty") && copPlayer.Position.DistanceTo2D(player.Position) <= 500 && (!copPlayer.HasData("isDead") || copPlayer.GetData("isDead") != true)) { if (player.Position.DistanceTo2D(new Vector3(458.9842, -997.2126, 24.91485)) <= 7) { @@ -218,9 +220,9 @@ namespace ReallifeGamemode.Server.Wanted } [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) 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(); if (Jailtime.ContainsKey(user.Id)) diff --git a/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs b/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs index a42705a4..d1856626 100644 --- a/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs +++ b/ReallifeGamemode.Server/Wanted/WantedEscapeTimer.cs @@ -28,7 +28,7 @@ namespace ReallifeGamemode.Server.Wanted timer.Elapsed += Timer_Elapsed; } - public static void ResetWantedTimeToElapse(Client client) + public static void ResetWantedTimeToElapse(Player client) { User user = client.GetUser(); if (user.FactionId == 1 || user.FactionId == 3) @@ -50,6 +50,8 @@ namespace ReallifeGamemode.Server.Wanted bool isNearCop = false; foreach (var playerCop in NAPI.Pools.GetAllPlayers()) { + if (!playerCop.IsLoggedIn()) continue; + User cop = playerCop.GetUser(); if (cop != null && (cop.FactionId == 1 || cop.FactionId == 3)) { diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs index 2f1466c8..48a23afa 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs @@ -16,14 +16,14 @@ namespace ReallifeGamemode.Server.WeaponDeal { public static bool checkWeaponDbyVehicle(Vehicle vehicle) { - if (!vehicle.HasData("WeaponDealLoad") || vehicle.GetData("WeaponDealLoad") == false) + if (!vehicle.HasData("WeaponDealLoad") || vehicle.GetData("WeaponDealLoad") == false) return false; return true; } [RemoteEvent("startWeaponDeal")] - public void SrvEVENT_startWeaponDeal(Client client) + public void SrvEVENT_startWeaponDeal(Player client) { var user = client.GetUser(); using (var context = new DatabaseContext()) @@ -77,7 +77,7 @@ namespace ReallifeGamemode.Server.WeaponDeal [RemoteEvent("loadWeaponTransport")] - public void SrvEVENT_loadWeaponTransport(Client client) + public void SrvEVENT_loadWeaponTransport(Player client) { if ((VehicleHash)client.Vehicle.Model != VehicleHash.Burrito3) return; diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs index de701419..8d3ffdf1 100644 --- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs +++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealPoints.cs @@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.WeaponDeal public static Vector3 getRndWD_Route(int factionID) { if (!factionWeaponDeal.ContainsKey(factionID)) - return null; + return new Vector3(); if (factionWeaponDeal[factionID] == -1) { diff --git a/ReallifeGamemode.Services/ClientService.cs b/ReallifeGamemode.Services/PlayerService.cs similarity index 83% rename from ReallifeGamemode.Services/ClientService.cs rename to ReallifeGamemode.Services/PlayerService.cs index a4aba3a8..41b8f1df 100644 --- a/ReallifeGamemode.Services/ClientService.cs +++ b/ReallifeGamemode.Services/PlayerService.cs @@ -11,19 +11,19 @@ using System.Text; namespace ReallifeGamemode.Services { - public class ClientService + public class PlayerService { /// /// Gibt einen Client anhand seines Namens oder der ID zurück /// /// Die ID oder der Name, nach dem gesucht werden soll /// - public static Client GetClientByNameOrId(string nameOrId) + public static Player GetPlayerByNameOrId(string nameOrId) { - Client toReturn = null; + Player toReturn = null; nameOrId = nameOrId.ToLower(); - List playerList = NAPI.Pools.GetAllPlayers(); + List playerList = NAPI.Pools.GetAllPlayers(); if (int.TryParse(nameOrId, out int id)) { diff --git a/ReallifeGamemode.Services/ReallifeGamemode.Services.csproj b/ReallifeGamemode.Services/ReallifeGamemode.Services.csproj index e031aa22..4283d21d 100644 --- a/ReallifeGamemode.Services/ReallifeGamemode.Services.csproj +++ b/ReallifeGamemode.Services/ReallifeGamemode.Services.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp3.1 Debug;Release;ServerBuild x64 AnyCPU;x64 diff --git a/postbuild.ps1 b/postbuild.ps1 index 010fabf7..c93bf675 100644 --- a/postbuild.ps1 +++ b/postbuild.ps1 @@ -20,8 +20,8 @@ Set-Variable sourceIndexJsPath -option Constant -value "$PSScriptRoot\ReallifeGa Set-Variable sourceDlcPacksPath -option Constant -value "$PSScriptRoot\ReallifeGamemode.Client\dlcpacks" # set constant dirs -Set-Variable runtimeDir -option Constant -value "bridge\runtime" -Set-Variable resourcesDir -option Constant -value "bridge\resources" +Set-Variable runtimeDir -option Constant -value "dotnet\runtime" +Set-Variable resourcesDir -option Constant -value "dotnet\resources" Set-Variable gamemodeDir -option Constant -value "reallife-gamemode" Set-Variable assetsDir -option Constant -value "client_packages\assets" Set-Variable indexJsDir -option Constant -value "client_packages"