omit empty arguments

Luluno01 · Jul 29, 2021 · 5e0db8e · 5e0db8e
1 parent d94b84b
commit 5e0db8e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/main/kotlin/cyou/untitled/bungeesafeguard/commands/BungeeSafeguard.kt b/src/main/kotlin/cyou/untitled/bungeesafeguard/commands/BungeeSafeguard.kt
@@ -2,6 +2,7 @@ package cyou.untitled.bungeesafeguard.commands
 
 import cyou.untitled.bungeesafeguard.BungeeSafeguardImpl
 import cyou.untitled.bungeesafeguard.commands.subcommands.SubcommandRegistry
+import cyou.untitled.bungeesafeguard.commands.subcommands.list.omitEmpty
 import cyou.untitled.bungeesafeguard.commands.subcommands.main.*
 import net.md_5.bungee.api.ChatColor
 import net.md_5.bungee.api.CommandSender
@@ -40,6 +41,7 @@ open class BungeeSafeguard(val context: BungeeSafeguardImpl): Command("bungeesaf
     }
 
     override fun execute(sender: CommandSender, args: Array<out String>) {
-        cmdReg.getSubcommand(sender, args)?.execute(sender, args.sliceArray(IntRange(1, args.size - 1)))
+        val fixedArgs = args.omitEmpty()
+        cmdReg.getSubcommand(sender, fixedArgs)?.execute(sender, args.sliceArray(IntRange(1, fixedArgs.size - 1)))
     }
 }
diff --git a/src/main/kotlin/cyou/untitled/bungeesafeguard/commands/ListCommand.kt b/src/main/kotlin/cyou/untitled/bungeesafeguard/commands/ListCommand.kt
@@ -1,7 +1,6 @@
 package cyou.untitled.bungeesafeguard.commands
 
 import cyou.untitled.bungeesafeguard.BungeeSafeguard
-import cyou.untitled.bungeesafeguard.commands.subcommands.list.Base
 import cyou.untitled.bungeesafeguard.list.ListManager
 import cyou.untitled.bungeesafeguard.list.UUIDList
 

diff --git a/src/main/kotlin/cyou/untitled/bungeesafeguard/commands/ListCommandImpl.kt b/src/main/kotlin/cyou/untitled/bungeesafeguard/commands/ListCommandImpl.kt
@@ -105,11 +105,12 @@ open class ListCommandImpl(
     }
 
     override fun execute(sender: CommandSender, args: Array<out String>) {
-        if (args.getOrNull(0) == "confirm") {
+        val fixedArgs = args.omitEmpty()
+        if (fixedArgs.getOrNull(0) == "confirm") {
             onConfirm(sender)
         } else {
-            val cmd = cmdReg.getSubcommand(sender, args) as Base? ?: return
-            val parsed = cmd.parseArgs(sender, args) ?: return Usage(name).sendUsage(sender)
+            val cmd = cmdReg.getSubcommand(sender, fixedArgs) as Base? ?: return
+            val parsed = cmd.parseArgs(sender, fixedArgs) ?: return Usage(name).sendUsage(sender)
             possiblyDoAfterConfirmation(sender, cmd, parsed)
         }
     }

diff --git a/src/main/kotlin/cyou/untitled/bungeesafeguard/commands/subcommands/list/helpers.kt b/src/main/kotlin/cyou/untitled/bungeesafeguard/commands/subcommands/list/helpers.kt
@@ -0,0 +1,5 @@
+package cyou.untitled.bungeesafeguard.commands.subcommands.list
+
+fun Array<out String>.omitEmpty(): Array<out String> {
+    return map { it.trim() }.filter { it.isNotBlank() }.toTypedArray()
+}