Merge pull request #96 from RocketModFix/fix-command-admin

sunnamed434 · web-flow · commit c7d892af44b0 · 2024-07-07T18:07:31.000+03:00
Fix command admin
diff --git a/Rocket.Unturned/Commands/CommandAdmin.cs b/Rocket.Unturned/Commands/CommandAdmin.cs
@@ -6,6 +6,7 @@
 using Rocket.API.Extensions;
 using Rocket.Unturned.Helpers;
 using SDG.Unturned;
+using Steamworks;
 
 namespace Rocket.Unturned.Commands
 {
@@ -49,31 +50,40 @@ public List<string> Aliases
 
         public void Execute(IRocketPlayer caller, string[] command)
         {
-            if (!R.Settings.Instance.WebPermissions.Enabled)
+            if (R.Settings.Instance.WebPermissions.Enabled)
             {
-                var playerName = command.GetStringParameter(0);
-                if (playerName == null)
-                {
-                    UnturnedChat.Say(caller, U.Translate("command_generic_invalid_parameter"));
-                    throw new WrongUsageOfCommandException(caller, this);
-                }
-                if (RocketUtilities.TryGetSteamIdFromText(playerName, out var steamId) == false)
-                {
-                    UnturnedChat.Say(caller, U.Translate("command_admin_player_invalid", playerName));
-                    throw new WrongUsageOfCommandException(caller, this);
-                }
-                var targetPlayer = UnturnedPlayer.FromCSteamID(steamId!.Value);
-                var targetPlayerName = targetPlayer?.Player != null
-                    ? targetPlayer.CharacterName
-                    : steamId.Value.ToString();
-                if (SteamAdminlist.checkAdmin(steamId!.Value))
-                {
-                    UnturnedChat.Say(caller, U.Translate("command_admin_player_is_admin", targetPlayerName));
-                    return;
-                }
+                UnturnedChat.Say(caller, $"This command is disabled because {nameof(R.Settings.Instance.WebPermissions)} is enabled.");
+                return;
+            }
+
+            var playerName = command.GetStringParameter(0);
+            if (playerName == null)
+            {
+                UnturnedChat.Say(caller, U.Translate("command_generic_invalid_parameter"));
+                throw new WrongUsageOfCommandException(caller, this);
+            }
+            if (RocketUtilities.TryGetSteamIdFromText(playerName, out var steamId) == false)
+            {
+                UnturnedChat.Say(caller, U.Translate("command_admin_player_invalid", playerName));
+                throw new WrongUsageOfCommandException(caller, this);
+            }
+            var targetPlayer = UnturnedPlayer.FromCSteamID(steamId!.Value);
+            var targetPlayerName = targetPlayer?.Player != null
+                ? targetPlayer.CharacterName
+                : steamId.Value.ToString();
+            if (SteamAdminlist.checkAdmin(steamId.Value))
+            {
+                UnturnedChat.Say(caller, U.Translate("command_admin_player_is_admin", targetPlayerName));
+                return;
+            }
 
-                UnturnedChat.Say(caller, U.Translate("command_admin_success", targetPlayerName));
+            if (RocketUtilities.TryGetSteamIdFromText(caller.Id, out var callerSteamId) == false)
+            {
+                callerSteamId = CSteamID.Nil;
             }
+
+            SteamAdminlist.admin(steamId.Value, callerSteamId!.Value);
+            UnturnedChat.Say(caller, U.Translate("command_admin_success", targetPlayerName));
         }
     }
 }
diff --git a/Rocket.Unturned/Helpers/RocketUtilities.cs b/Rocket.Unturned/Helpers/RocketUtilities.cs
@@ -3,7 +3,7 @@
 
 namespace Rocket.Unturned.Helpers;
 
-public static class RocketUtilities
+internal static class RocketUtilities
 {
     public static bool TryGetSteamIdFromText(string text, out CSteamID? steamId)
     {
diff --git a/Rocket.Unturned/Rocket.Unturned.csproj b/Rocket.Unturned/Rocket.Unturned.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="RocketModFix.UnityEngine.Redist" Version="2021.3.29.1">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="RocketModFix.Unturned.Redist.Server" Version="3.24.4">
+    <PackageReference Include="RocketModFix.Unturned.Redist.Server" Version="3.24.4.1">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/Rocket/Rocket.API/Rocket.API.csproj b/Rocket/Rocket.API/Rocket.API.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="RocketModFix.UnityEngine.Redist" Version="2021.3.28.1">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="RocketModFix.Unturned.Redist.Server" Version="3.24.4">
+    <PackageReference Include="RocketModFix.Unturned.Redist.Server" Version="3.24.4.1">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/Rocket/Rocket.Core/Rocket.Core.csproj b/Rocket/Rocket.Core/Rocket.Core.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="RocketModFix.UnityEngine.Redist" Version="2021.3.28.1">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="RocketModFix.Unturned.Redist.Server" Version="3.24.4">
+    <PackageReference Include="RocketModFix.Unturned.Redist.Server" Version="3.24.4.1">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Rocket.Unturned.Helpers;`
`5`	`5`
`6`		`-public static class RocketUtilities`
	`6`	`+internal static class RocketUtilities`
`7`	`7`	`{`
`8`	`8`	`public static bool TryGetSteamIdFromText(string text, out CSteamID? steamId)`
`9`	`9`	`{`