2019-04-22 21:36:14 +00:00
From c257016dfd957d957c31920232cd6ba10a5db45e Mon Sep 17 00:00:00 2001
2017-06-09 14:29:59 +00:00
From: kashike <kashike@vq.lc>
Date: Fri, 9 Jun 2017 07:24:24 -0700
Subject: [PATCH] Add configuration option to prevent player names from being
suggested
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
2019-04-22 21:36:14 +00:00
index 08570c13..92bc8eb6 100644
2017-06-09 14:29:59 +00:00
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
2019-04-22 21:36:14 +00:00
@@ -1562,6 +1562,16 @@ public final class Bukkit {
2017-06-09 14:29:59 +00:00
public static boolean reloadCommandAliases() {
return server.reloadCommandAliases();
}
+
+ /**
+ * Checks if player names should be suggested when a command returns {@code null} as
+ * their tab completion result.
+ *
+ * @return true if player names should be suggested
+ */
+ public static boolean suggestPlayerNamesWhenNullTabCompletions() {
+ return server.suggestPlayerNamesWhenNullTabCompletions();
+ }
// Paper end
2019-03-20 00:28:15 +00:00
@NotNull
2017-06-09 14:29:59 +00:00
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
2019-04-22 21:36:14 +00:00
index fc8887d1..9fa704e3 100644
2017-06-09 14:29:59 +00:00
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
2019-04-22 21:36:14 +00:00
@@ -1368,4 +1368,14 @@ public interface Server extends PluginMessageRecipient {
2017-06-09 14:29:59 +00:00
void reloadPermissions(); // Paper
boolean reloadCommandAliases(); // Paper
+
+ // Paper start - allow preventing player name suggestions by default
+ /**
+ * Checks if player names should be suggested when a command returns {@code null} as
+ * their tab completion result.
+ *
+ * @return true if player names should be suggested
+ */
+ boolean suggestPlayerNamesWhenNullTabCompletions();
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
2019-04-22 21:36:14 +00:00
index 92c23424..e420b790 100644
2017-06-09 14:29:59 +00:00
--- a/src/main/java/org/bukkit/command/PluginCommand.java
+++ b/src/main/java/org/bukkit/command/PluginCommand.java
2019-03-20 00:28:15 +00:00
@@ -151,6 +151,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
2017-06-09 14:29:59 +00:00
}
if (completions == null) {
+ if (!sender.getServer().suggestPlayerNamesWhenNullTabCompletions()) return com.google.common.collect.ImmutableList.of(); // Paper - allow preventing player name suggestions by default
return super.tabComplete(sender, alias, args);
}
return completions;
--
2019-03-20 00:28:15 +00:00
2.21.0
2017-06-09 14:29:59 +00:00