2019-07-05 04:13:38 +02:00
From 65568a36e514757c020d6a6b2dd6c6bba3376a83 Mon Sep 17 00:00:00 2001
2018-07-18 02:37:30 +02:00
From: Aikar <aikar@aikar.co>
Date: Sun, 26 Nov 2017 13:19:58 -0500
Subject: [PATCH] AsyncTabCompleteEvent
Let plugins be able to control tab completion of commands and chat async.
This will be useful for frameworks like ACF so we can define async safe completion handlers,
and avoid going to main for tab completions.
Especially useful if you need to query a database in order to obtain the results for tab
completion, such as offline players.
Also adds isCommand and getLocation to the sync TabCompleteEvent
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-07-05 04:13:38 +02:00
index eb720814b2..0a9fc4653a 100644
2018-07-18 02:37:30 +02:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-05-14 06:17:05 +02:00
@@ -520,10 +520,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
2018-07-18 02:37:30 +02:00
2019-04-28 01:23:53 +02:00
@Override
2018-07-18 06:52:33 +02:00
public void a(PacketPlayInTabComplete packetplayintabcomplete) {
- PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer());
+ // PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
2018-07-18 02:37:30 +02:00
// CraftBukkit start
2018-08-29 18:26:24 +02:00
if (chatSpamField.addAndGet(this, 1) > 500 && !this.minecraftServer.getPlayerList().isOp(this.player.getProfile())) {
2018-09-18 04:04:47 +02:00
- this.disconnect(new ChatMessage("disconnect.spam", new Object[0]));
2019-05-10 19:42:33 +02:00
+ minecraftServer.scheduleOnMain(() -> this.disconnect(new ChatMessage("disconnect.spam", new Object[0]))); // Paper
2018-07-18 02:37:30 +02:00
return;
}
2018-08-26 20:11:49 +02:00
// CraftBukkit end
2019-06-03 04:19:44 +02:00
@@ -533,12 +533,37 @@ public class PlayerConnection implements PacketListenerPlayIn {
2018-08-26 20:11:49 +02:00
stringreader.skip();
}
2019-01-01 04:15:55 +01:00
- ParseResults<CommandListenerWrapper> parseresults = this.minecraftServer.getCommandDispatcher().a().parse(stringreader, this.player.getCommandListener());
2018-10-02 07:38:51 +02:00
+ // Paper start - async tab completion
2018-07-18 02:37:30 +02:00
+ com.destroystokyo.paper.event.server.AsyncTabCompleteEvent event;
2018-07-18 06:52:33 +02:00
+ java.util.List<String> completions = new java.util.ArrayList<>();
+ String buffer = packetplayintabcomplete.c();
2018-07-18 02:37:30 +02:00
+ event = new com.destroystokyo.paper.event.server.AsyncTabCompleteEvent(this.getPlayer(), completions,
2018-07-18 06:52:33 +02:00
+ buffer, true, null);
2018-07-18 02:37:30 +02:00
+ event.callEvent();
+ completions = event.isCancelled() ? com.google.common.collect.ImmutableList.of() : event.getCompletions();
2018-08-29 05:07:50 +02:00
+ // If the event isn't handled, we can assume that we have no completions, and so we'll ask the server
+ if (!event.isHandled()) {
2018-10-02 07:38:51 +02:00
+ if (!event.isCancelled()) {
+ // Paper end - async tab completion
2019-06-03 04:19:44 +02:00
+ this.minecraftServer.scheduleOnMain(() -> { // Paper - This needs to be on main
2019-01-01 04:15:55 +01:00
+ ParseResults<CommandListenerWrapper> parseresults = this.minecraftServer.getCommandDispatcher().a().parse(stringreader, this.player.getCommandListener());
2018-10-02 07:38:51 +02:00
this.minecraftServer.getCommandDispatcher().a().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
if (((Suggestions) suggestions).isEmpty()) return; // CraftBukkit - don't send through empty suggestions - prevents [<args>] from showing for plugins with nothing more to offer
- this.networkManager.sendPacket(new PacketPlayOutTabComplete(packetplayintabcomplete.b(), (Suggestions) suggestions)); // CraftBukkit - decompile error
- });
+ this.networkManager.sendPacket(new PacketPlayOutTabComplete(packetplayintabcomplete.b(), (Suggestions) suggestions)); // CraftBukkit - decompile error
+ });
2019-06-03 04:19:44 +02:00
+ }); // Paper - This needs to be on main
2018-07-18 02:37:30 +02:00
+ }
2018-10-02 07:38:51 +02:00
+ // Paper start - async tab completion
2018-08-29 05:07:50 +02:00
+ } else if (!completions.isEmpty()) {
2019-02-05 04:39:00 +01:00
+ com.mojang.brigadier.suggestion.SuggestionsBuilder builder = new com.mojang.brigadier.suggestion.SuggestionsBuilder(packetplayintabcomplete.c(), stringreader.getTotalLength());
2018-08-29 05:07:50 +02:00
+
2019-02-05 04:39:00 +01:00
+ builder = builder.createOffset(builder.getInput().lastIndexOf(' ') + 1);
+ completions.forEach(builder::suggest);
+ player.playerConnection.sendPacket(new PacketPlayOutTabComplete(packetplayintabcomplete.b(), builder.buildFuture().join()));
2018-07-18 06:52:33 +02:00
+ }
2018-10-02 07:38:51 +02:00
+ // Paper end - async tab completion
2018-08-26 20:11:49 +02:00
+
2018-07-18 02:37:30 +02:00
}
2019-04-28 01:23:53 +02:00
@Override
2018-07-18 02:37:30 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2019-07-05 04:13:38 +02:00
index b102076a2b..4e0d1ec0d3 100644
2018-07-18 02:37:30 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2019-07-05 04:13:38 +02:00
@@ -1667,7 +1667,7 @@ public final class CraftServer implements Server {
2018-07-18 02:37:30 +02:00
offers = tabCompleteChat(player, message);
}
2018-07-18 06:52:33 +02:00
2018-07-18 02:37:30 +02:00
- TabCompleteEvent tabEvent = new TabCompleteEvent(player, message, offers);
2019-05-06 05:53:47 +02:00
+ TabCompleteEvent tabEvent = new TabCompleteEvent(player, message, offers, message.startsWith("/") || forceCommand, pos != null ? net.minecraft.server.MCUtil.toLocation(((CraftWorld) player.getWorld()).getHandle(), new BlockPosition(pos)) : null); // Paper
2018-07-18 02:37:30 +02:00
getPluginManager().callEvent(tabEvent);
return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
2019-07-05 04:13:38 +02:00
index 5510266fb1..a51202ed53 100644
2018-07-18 02:37:30 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
2019-05-06 04:58:04 +02:00
@@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
2018-07-18 02:37:30 +02:00
public void complete(LineReader reader, ParsedLine line, List<Candidate> candidates) {
final CraftServer server = this.server.server;
final String buffer = line.line();
+ // Async Tab Complete
+ com.destroystokyo.paper.event.server.AsyncTabCompleteEvent event;
+ java.util.List<String> completions = new java.util.ArrayList<>();
+ event = new com.destroystokyo.paper.event.server.AsyncTabCompleteEvent(server.getConsoleSender(), completions,
+ buffer, true, null);
+ event.callEvent();
+ completions = event.isCancelled() ? com.google.common.collect.ImmutableList.of() : event.getCompletions();
+
+ if (event.isCancelled() || event.isHandled()) {
+ // Still fire sync event with the provided completions, if someone is listening
+ if (!event.isCancelled() && TabCompleteEvent.getHandlerList().getRegisteredListeners().length > 0) {
+ List<String> finalCompletions = completions;
+ Waitable<List<String>> syncCompletions = new Waitable<List<String>>() {
+ @Override
+ protected List<String> evaluate() {
+ org.bukkit.event.server.TabCompleteEvent syncEvent = new org.bukkit.event.server.TabCompleteEvent(server.getConsoleSender(), buffer, finalCompletions);
+ return syncEvent.callEvent() ? syncEvent.getCompletions() : com.google.common.collect.ImmutableList.of();
+ }
+ };
+ server.getServer().processQueue.add(syncCompletions);
+ try {
+ completions = syncCompletions.get();
+ } catch (InterruptedException | ExecutionException e1) {
+ e1.printStackTrace();
+ }
+ }
+
+ if (!completions.isEmpty()) {
+ candidates.addAll(completions.stream().map(Candidate::new).collect(java.util.stream.Collectors.toList()));
+ }
+ return;
+ }
+
// Paper end
Waitable<List<String>> waitable = new Waitable<List<String>>() {
@Override
--
2019-06-25 21:18:50 +02:00
2.22.0
2018-07-18 02:37:30 +02:00