Clean up

uEssentials · Jul 18, 2016 · ca68259 · ca68259
1 parent e40e4ff
commit ca68259
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/src/NativeModules/Warp/Commands/CommandDelWarp.cs b/src/NativeModules/Warp/Commands/CommandDelWarp.cs
@@ -29,21 +29,21 @@ namespace Essentials.NativeModules.Warp.Commands {
         Name = "delwarp",
         Aliases = new[] { "deletewarp" },
         Usage = "[warp_name]",
-        Description = "Delete an existing warp"
+        Description = "Delete an existing warp",
+        MinArgs = 1,
+        MaxArgs = 1
     )]
     public class CommandDelWarp : EssCommand {
 
-        public override CommandResult OnExecute(ICommandSource source, ICommandArgs parameters) {
-            if (parameters.IsEmpty || parameters.Length > 1) {
-                return CommandResult.ShowUsage();
-            }
+        public override CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
+            var warpName = args[0].ToString();
 
-            if (!WarpModule.Instance.WarpManager.Contains(parameters[0].ToString())) {
-                return CommandResult.Lang("WARP_NOT_EXIST", parameters[0]);
+            if (!WarpModule.Instance.WarpManager.Contains(warpName)) {
+                return CommandResult.Lang("WARP_NOT_EXIST", warpName);
             }
 
-            WarpModule.Instance.WarpManager.Delete(parameters[0].ToString());
-            EssLang.Send(source, "WARP_REMOVED", parameters[0]);
+            WarpModule.Instance.WarpManager.Delete(warpName);
+            EssLang.Send(src, "WARP_REMOVED", warpName);
 
             return CommandResult.Success();
         }

diff --git a/src/NativeModules/Warp/Commands/CommandWarp.cs b/src/NativeModules/Warp/Commands/CommandWarp.cs
@@ -46,37 +46,37 @@ public class CommandWarp : EssCommand {
             task => task.Cancel()
         );
 
-        public override CommandResult OnExecute(ICommandSource source, ICommandArgs parameters) {
-            var player = source.ToPlayer();
+        public override CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
+            var player = src.ToPlayer();
 
-            if (parameters.Length == 0 || parameters.Length > 1) {
+            if (args.Length == 0 || args.Length > 1) {
                 return CommandResult.ShowUsage();
             }
 
-            if (!WarpModule.Instance.WarpManager.Contains(parameters[0].ToString())) {
-                return CommandResult.Lang("WARP_NOT_EXIST", parameters[0]);
+            if (!WarpModule.Instance.WarpManager.Contains(args[0].ToString())) {
+                return CommandResult.Lang("WARP_NOT_EXIST", args[0]);
             }
 
-            if (!player.HasPermission($"essentials.warp.{parameters[0]}")) {
-                return CommandResult.Lang("WARP_NO_PERMISSION", parameters[0]);
+            if (!player.HasPermission($"essentials.warp.{args[0]}")) {
+                return CommandResult.Lang("WARP_NO_PERMISSION", args[0]);
             }
 
             if (player.RocketPlayer.Stance == EPlayerStance.DRIVING ||
                 player.RocketPlayer.Stance == EPlayerStance.SITTING) {
                 return CommandResult.Lang("CANNOT_TELEPORT_DRIVING");
             }
 
-            var dest = WarpModule.Instance.WarpManager.GetByName(parameters[0].ToString());
+            var dest = WarpModule.Instance.WarpManager.GetByName(args[0].ToString());
             var cooldown = UEssentials.Config.WarpCommand.Cooldown;
 
             if (cooldown > 0 && !player.HasPermission("essentials.bypass.warpcooldown")) {
-                EssLang.Send(source, "WARP_COOLDOWN", cooldown);
+                EssLang.Send(src, "WARP_COOLDOWN", cooldown);
             }
 
             var task = Tasks.New(t => {
                 Delay.Remove(player.CSteamId.m_SteamID);
                 player.Teleport(dest.Location, dest.Rotation);
-                EssLang.Send(source, "WARP_TELEPORTED", parameters[0]);
+                EssLang.Send(src, "WARP_TELEPORTED", args[0]);
             });
 
             task.Delay(player.HasPermission("essentials.bypass.warpcooldown") ? 0 : cooldown*1000).Go();

diff --git a/src/NativeModules/Warp/Commands/CommandWarps.cs b/src/NativeModules/Warp/Commands/CommandWarps.cs
@@ -32,17 +32,18 @@ namespace Essentials.NativeModules.Warp.Commands {
     )]
     public class CommandWarps : EssCommand {
 
-        public override CommandResult OnExecute(ICommandSource source, ICommandArgs parameters) {
+        public override CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
             var warps = (
                 from warp in WarpModule.Instance.WarpManager.Warps
-                where warp.CanUse(source)
+                where warp.CanUse(src)
                 select warp.Name
-                ).ToArray();
+            ).ToArray();
 
-            if (warps.Length == 0)
-                EssLang.Send(source, "WARP_NONE");
-            else
-                EssLang.Send(source, "WARP_LIST", string.Join(", ", warps));
+            if (warps.Length == 0) {
+                EssLang.Send(src, "WARP_NONE");
+            } else {
+                EssLang.Send(src, "WARP_LIST", string.Join(", ", warps));
+            }
 
             return CommandResult.Success();
         }