Allow tab complete for /whitelist add, I guess it can *occasionally* make sense to add online players.

This commit is contained in:
md_5 2014-07-22 21:14:52 +10:00
parent 0e1fcfbe70
commit 27f8aa22bd

View file

@ -1,4 +1,4 @@
From 7b0f1478d627cf79d45808e0fe7b390d6d925f09 Mon Sep 17 00:00:00 2001
From bf43f4f74fb7bfb1bc77293c2fb2c9b421b0cb72 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 22 Jul 2014 21:01:32 +1000
Subject: [PATCH] Fix slow tab complete for some commands.
@ -19,18 +19,18 @@ index 1b71d49..be85334 100644
if (player.isOp() && StringUtil.startsWithIgnoreCase(playerName, args[0])) {
completions.add(playerName);
diff --git a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
index b3fa4f8..41cfe73 100644
index b3fa4f8..6559b33 100644
--- a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
@@ -102,7 +102,7 @@ public class WhitelistCommand extends VanillaCommand {
if (args.length == 1) {
return StringUtil.copyPartialMatches(args[0], WHITELIST_SUBCOMMANDS, new ArrayList<String>(WHITELIST_SUBCOMMANDS.size()));
@@ -104,7 +104,7 @@ public class WhitelistCommand extends VanillaCommand {
} else if (args.length == 2) {
- if (args[0].equalsIgnoreCase("add")) {
+ if (false && args[0].equalsIgnoreCase("add")) { // Spigot - remove case entirely.
if (args[0].equalsIgnoreCase("add")) {
List<String> completions = new ArrayList<String>();
for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
- for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
+ for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - well maybe sometimes you haven't turned the whitelist on just yet.
String name = player.getName();
if (StringUtil.startsWithIgnoreCase(name, args[1]) && !player.isWhitelisted()) {
completions.add(name);
--
1.9.1