From 25a29d3372c25562753c859b83741ca11f72fc76 Mon Sep 17 00:00:00 2001 From: CroniX Date: Thu, 28 Jan 2021 21:35:46 +0100 Subject: [PATCH] Remove ADMIN2 ADMIN3 convert to ADMIN --- .../Commands/AdminCommands.cs | 58 ++++++++----------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 7d4764e1..f119dafc 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -456,7 +456,7 @@ namespace ReallifeGamemode.Server.Commands #endregion Support - #region ALevel1 + #region Admin [Command("countdown", "~m~Benutzung: ~s~/countdown [Zeit] [Text]", GreedyArg = true)] public void CmdAdminCountdown(Player player, string timer_string, string text) @@ -1241,14 +1241,10 @@ namespace ReallifeGamemode.Server.Commands ChatService.BroadcastAdmin($"~g~Fahrzeug(e) respawnt: ~s~{player.Name} hat {respawnedVehicleCount} Fahrzeuge respawnt (Radius: {radius} SE).", AdminLevel.ADMIN); } - #endregion ALevel1 - - #region ALevel2 - [Command("sethp", "~m~Benutzung: ~s~/sethp [Spieler] (HP)")] public void CmdAdminSetHp(Player player, string name, int hp = 100) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1269,7 +1265,7 @@ namespace ReallifeGamemode.Server.Commands [Command("clothes", "~m~Benutzung: ~s~/clothes [Spieler] [Component ID] [Drawable] (Textur)")] public void CmdAdminClothes(Player player, string name, int component, int drawable, int texture = 0) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1313,7 +1309,7 @@ namespace ReallifeGamemode.Server.Commands [Command("props", "~m~Benutzung: ~s~/props [Spieler] [Component ID] [Drawable] (Textur)")] public void CmdAdminProps(Player player, string name, int slot, int component, int texture = 0) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1341,7 +1337,7 @@ namespace ReallifeGamemode.Server.Commands if (target == null) return; - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1353,7 +1349,7 @@ namespace ReallifeGamemode.Server.Commands [Command("arevive", "~m~Benutzung: ~s~/arevive [Spieler]")] public void CmdAdminRevive(Player player, string name) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1389,7 +1385,7 @@ namespace ReallifeGamemode.Server.Commands [Command("setap", "~m~Benutzung: ~s~/setap [Spieler] (Armor)")] public void CmdAdminSetAP(Player player, string name, int armor = 100) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1411,7 +1407,7 @@ namespace ReallifeGamemode.Server.Commands public void CmdFactionClear(Player player, string nameOrId, string reason) { User user = player.GetUser(); - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN2) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1462,14 +1458,10 @@ namespace ReallifeGamemode.Server.Commands } } - #endregion ALevel2 - - #region ALevel3 - [Command("adice", "~m~Benutzung: ~s~/adice [Zahl]")] public void CmdUserAdice(Player player, int number) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1489,7 +1481,7 @@ namespace ReallifeGamemode.Server.Commands [Command("veh", "~m~Benutzung: ~s~/veh [Fahrzeug] (Farbe 1) (Farbe 2)")] public void CmdAdminVeh(Player player, string hash, int color1 = 111, int color2 = 111) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) //TODO: Bestimmte Autos nur ab Adminlevel 1337, "normale Fahrzeuge" schon ab Adminlevel 3. { ChatService.NotAuthorized(player); @@ -1521,7 +1513,7 @@ namespace ReallifeGamemode.Server.Commands [Command("fv", "~m~Benutzung: ~s~/fv", Alias = "vfix")] public void CmdAdminFixveh(Player player) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1539,7 +1531,7 @@ namespace ReallifeGamemode.Server.Commands [Command("vdestroy", "~m~Benutzung: ~s~/vdestroy (ID)")] public void CmdAdminVdestroy(Player player, int vid = -1) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1581,7 +1573,7 @@ namespace ReallifeGamemode.Server.Commands [Command("vlivery", "~m~Benutzung: ~s~/vlivery [Livery]")] public void CmdAdminVlivery(Player player, int livery) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1611,7 +1603,7 @@ namespace ReallifeGamemode.Server.Commands [Command("vcolor", "~m~Benutzung: ~s~/vcolor [Farb-ID1] [Farb-ID2]")] public void CmdAdminColor(Player player, int color1, int color2) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1631,7 +1623,7 @@ namespace ReallifeGamemode.Server.Commands [Command("giveweapon", "~m~Benutzung: ~s~/giveweapon [Spieler] [Waffe] [Munition]")] public void CmdAdminGiveweapon(Player player, string name, string hash, int ammo) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1672,7 +1664,7 @@ namespace ReallifeGamemode.Server.Commands [Command("vmod", "~m~Benutzung: ~s~/vmod [Slot] [Mod ID]")] public void CmdAdminVmod(Player player, int slot, int mod) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1690,7 +1682,7 @@ namespace ReallifeGamemode.Server.Commands [Command("aneon", "~m~Benutzung: ~s~/aneon [R][G][B]")] public void CmdAdminNeon(Player player, int r, int g, int b) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1710,7 +1702,7 @@ namespace ReallifeGamemode.Server.Commands [Command("vehsmoke", "~m~Benutzung: ~s~/vehsmoke [R][G][B]")] public void CmdAdminVehSmoke(Player player, int r, int g, int b) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1729,7 +1721,7 @@ namespace ReallifeGamemode.Server.Commands [Command("rsethp", "~m~Benutzung: ~s~/rsethp [Radius] (Leben)")] public void CmdAdminRangeSetHP(Player player, float radius, int hp = 100) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1748,7 +1740,7 @@ namespace ReallifeGamemode.Server.Commands [Command("rsetap", "~m~Benutzung: ~s~/rsetap [Radius] (Armor)")] public void CmdAdminRangeSetAP(Player player, float radius, int Armor = 100) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1767,7 +1759,7 @@ namespace ReallifeGamemode.Server.Commands [Command("rgiveweapon", "~m~Benutzung: ~s~/rgiveweapon [Radius] [Waffe] [Munition]")] public void CmdAdminRangeGiveWeapon(Player player, float radius, string weapon, int munition) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1803,7 +1795,7 @@ namespace ReallifeGamemode.Server.Commands [Command("settime", "~m~Benutzung: ~s~/settime [Stunde] (Minuten) (Sekunden)")] public void CmdAdminSetTime(Player player, int hour, int min = 0, int sec = 0) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1831,7 +1823,7 @@ namespace ReallifeGamemode.Server.Commands [Command("setweather", "~m~Benutzung: ~s~/setweather [Wetter]")] public void CmdAdminSetweather(Player player, string weather) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1871,7 +1863,7 @@ namespace ReallifeGamemode.Server.Commands [Command("showtuningmenu", "~m~Benutzung: ~s~/showtuningmenu", Alias = "stm")] public void CmdAdminShowtuningmenu(Player player) { - if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true) + if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) { ChatService.NotAuthorized(player); return; @@ -1888,7 +1880,7 @@ namespace ReallifeGamemode.Server.Commands } } - #endregion ALevel3 + #endregion Admin #region ALevel1337 [Command("wepmod", "~m~Benutzung: ~s~/wepmod [Variable]")]