From 38a8469ab403f9e1fd026e5668314902b6fadd26 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 15 Sep 2013 15:14:47 +1000 Subject: [PATCH] Cap command completion to one argument --- .../src/main/java/net/md_5/bungee/command/CommandFind.java | 7 +++++++ .../main/java/net/md_5/bungee/command/CommandServer.java | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandFind.java b/proxy/src/main/java/net/md_5/bungee/command/CommandFind.java index 7da6c13c..e6bd2b2f 100644 --- a/proxy/src/main/java/net/md_5/bungee/command/CommandFind.java +++ b/proxy/src/main/java/net/md_5/bungee/command/CommandFind.java @@ -1,5 +1,6 @@ package net.md_5.bungee.command; +import java.util.Collections; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; @@ -31,4 +32,10 @@ public class CommandFind extends PlayerCommand } } } + + @Override + public Iterable onTabComplete(CommandSender sender, String[] args) + { + return ( args.length == 0 ) ? super.onTabComplete( sender, args ) : Collections.EMPTY_LIST; + } } diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandServer.java b/proxy/src/main/java/net/md_5/bungee/command/CommandServer.java index 72c61283..5ee09a37 100644 --- a/proxy/src/main/java/net/md_5/bungee/command/CommandServer.java +++ b/proxy/src/main/java/net/md_5/bungee/command/CommandServer.java @@ -3,6 +3,7 @@ package net.md_5.bungee.command; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; +import java.util.Collections; import java.util.Map; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; @@ -68,7 +69,7 @@ public class CommandServer extends Command implements TabExecutor @Override public Iterable onTabComplete(final CommandSender sender, String[] args) { - return Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServers().values(), new Predicate() + return ( args.length != 0 ) ? Collections.EMPTY_LIST : Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServers().values(), new Predicate() { @Override public boolean apply(ServerInfo input)