From 0e1fcfbe70c2eb64c6649a02edbd874eeda1d734 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 22 Jul 2014 21:12:29 +1000 Subject: [PATCH] Only suggest ops to deop and remove whitelist add case entirely. /whitelist add makes no sense! --- ...-slow-tab-complete-for-some-commands.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch b/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch index 500c450b..895daed0 100644 --- a/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch +++ b/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch @@ -1,4 +1,4 @@ -From 499a3956dbbf88d5d84ed8d7b51f0a596ce60f10 Mon Sep 17 00:00:00 2001 +From 7b0f1478d627cf79d45808e0fe7b390d6d925f09 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 22 Jul 2014 21:01:32 +1000 Subject: [PATCH] Fix slow tab complete for some commands. @@ -6,7 +6,7 @@ Subject: [PATCH] Fix slow tab complete for some commands. Use online players instead of offline players, which is very slow. diff --git a/src/main/java/org/bukkit/command/defaults/DeopCommand.java b/src/main/java/org/bukkit/command/defaults/DeopCommand.java -index 1b71d49..8a571e8 100644 +index 1b71d49..be85334 100644 --- a/src/main/java/org/bukkit/command/defaults/DeopCommand.java +++ b/src/main/java/org/bukkit/command/defaults/DeopCommand.java @@ -49,7 +49,7 @@ public class DeopCommand extends VanillaCommand { @@ -14,23 +14,23 @@ index 1b71d49..8a571e8 100644 if (args.length == 1) { List completions = new ArrayList(); - for (OfflinePlayer player : Bukkit.getOfflinePlayers()) { -+ for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - offline players is slow ++ for (OfflinePlayer player : Bukkit.getOperators()) { // Spigot - only deop ops! String playerName = player.getName(); 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..fd81ee3 100644 +index b3fa4f8..41cfe73 100644 --- a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java +++ b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java -@@ -104,7 +104,7 @@ public class WhitelistCommand extends VanillaCommand { +@@ -102,7 +102,7 @@ public class WhitelistCommand extends VanillaCommand { + if (args.length == 1) { + return StringUtil.copyPartialMatches(args[0], WHITELIST_SUBCOMMANDS, new ArrayList(WHITELIST_SUBCOMMANDS.size())); } else if (args.length == 2) { - if (args[0].equalsIgnoreCase("add")) { +- if (args[0].equalsIgnoreCase("add")) { ++ if (false && args[0].equalsIgnoreCase("add")) { // Spigot - remove case entirely. List completions = new ArrayList(); -- for (OfflinePlayer player : Bukkit.getOfflinePlayers()) { -+ for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - offline players is slow + for (OfflinePlayer player : Bukkit.getOfflinePlayers()) { String name = player.getName(); - if (StringUtil.startsWithIgnoreCase(name, args[1]) && !player.isWhitelisted()) { - completions.add(name); -- 1.9.1