From bb2c1736c30cc2ef6addfeb928d669bf97800c89 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Tue, 9 Oct 2012 19:44:04 +0100 Subject: [PATCH] Delegate tab-completion. Fixes BUKKIT-2181. Adds BUKKIT-2602 CommandMap now contains the functionality for tab completion. This commit replaces the vanilla implementation and simply delegates it to the Bukkit API. By: Score_Under --- .../org/bukkit/craftbukkit/CraftServer.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 0c55945b20..56ae1420cc 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -58,6 +58,7 @@ import org.bukkit.World; import org.bukkit.World.Environment; import org.bukkit.WorldCreator; import org.bukkit.command.Command; +import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.PluginCommand; @@ -1234,4 +1235,41 @@ public final class CraftServer implements Server { public WarningState getWarningState() { return warningState; } + + public List tabComplete(net.minecraft.server.ICommandListener sender, String message) { + if (!(sender instanceof EntityPlayer)) { + return ImmutableList.of(); + } + + Player player = ((EntityPlayer) sender).getBukkitEntity(); + if (message.startsWith("/")) { + return tabCompleteCommand(player, message); + } else { + return tabCompleteChat(player, message); + } + } + + public List tabCompleteCommand(Player player, String message) { + List completions = null; + try { + completions = getCommandMap().tabComplete(player, message.substring(1)); + } catch (CommandException ex) { + player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command"); + getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex); + } + + return completions == null ? ImmutableList.of() : completions; + } + + public List tabCompleteChat(Player player, String message) { + Player[] players = getOnlinePlayers(); + List completions = new ArrayList(players.length); + for (Player p : players) { + if (player.canSee(p)) { + completions.add(p.getName()); + } + } + + return completions; + } }