twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-06 07:02:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

SPIGOT-215: Implement infrastructure for Location tab completes

Browse Source
This commit is contained in:
DemonWav
2016-08-25 09:48:52 +10:00
committed by md_5
parent 4db0855e3e
commit c74e2a7301
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@@ -29,6 +29,7 @@ import org.bukkit.BanList;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.UnsafeValues;
@@ -1528,7 +1529,7 @@ public final class CraftServer implements Server {
return warningState;
}
public List<String> tabComplete(net.minecraft.server.ICommandListener sender, String message) {
public List<String> tabComplete(net.minecraft.server.ICommandListener sender, String message, BlockPosition pos) {
if (!(sender instanceof EntityPlayer)) {
return ImmutableList.of();
}
@@ -1536,7 +1537,7 @@ public final class CraftServer implements Server {
List<String> offers;
Player player = ((EntityPlayer) sender).getBukkitEntity();
if (message.startsWith("/")) {
offers = tabCompleteCommand(player, message);
offers = tabCompleteCommand(player, message, pos);
} else {
offers = tabCompleteChat(player, message);
}
@@ -1547,10 +1548,14 @@ public final class CraftServer implements Server {
return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
}
public List<String> tabCompleteCommand(Player player, String message) {
public List<String> tabCompleteCommand(Player player, String message, BlockPosition pos) {
List<String> completions = null;
try {
completions = getCommandMap().tabComplete(player, message.substring(1));
if (pos == null) {
completions = getCommandMap().tabComplete(player, message.substring(1));
} else {
completions = getCommandMap().tabComplete(player, message.substring(1), new Location(player.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
}
} 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);