49 lines
2.4 KiB
Diff
49 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Callahan <mr.callahhh@gmail.com>
|
|
Date: Wed, 8 Apr 2020 02:42:14 -0500
|
|
Subject: [PATCH] Async command map building
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/commands/CommandDispatcher.java b/src/main/java/net/minecraft/commands/CommandDispatcher.java
|
|
index 63948c78205730d4aa6a6cc418f4f9de30401beb..592b1bb2ce5cedb627f42c73ef072ade6553347e 100644
|
|
--- a/src/main/java/net/minecraft/commands/CommandDispatcher.java
|
|
+++ b/src/main/java/net/minecraft/commands/CommandDispatcher.java
|
|
@@ -29,6 +29,7 @@ import net.minecraft.network.chat.ChatHoverable;
|
|
import net.minecraft.network.chat.ChatMessage;
|
|
import net.minecraft.network.chat.IChatMutableComponent;
|
|
import net.minecraft.network.protocol.game.PacketPlayOutCommands;
|
|
+import net.minecraft.server.MinecraftServer;
|
|
import net.minecraft.server.commands.CommandAdvancement;
|
|
import net.minecraft.server.commands.CommandAttribute;
|
|
import net.minecraft.server.commands.CommandBan;
|
|
@@ -328,6 +329,14 @@ public class CommandDispatcher {
|
|
if ( org.spigotmc.SpigotConfig.tabComplete < 0 ) return; // Spigot
|
|
// CraftBukkit start
|
|
// Register Vanilla commands into builtRoot as before
|
|
+ // Paper start - Async command map building
|
|
+ java.util.concurrent.ForkJoinPool.commonPool().execute(() -> {
|
|
+ sendAsync(entityplayer);
|
|
+ });
|
|
+ }
|
|
+
|
|
+ private void sendAsync(EntityPlayer entityplayer) {
|
|
+ // Paper end - Async command map building
|
|
Map<CommandNode<CommandListenerWrapper>, CommandNode<ICompletionProvider>> map = Maps.newIdentityHashMap(); // Use identity to prevent aliasing issues
|
|
RootCommandNode vanillaRoot = new RootCommandNode();
|
|
|
|
@@ -345,7 +354,14 @@ public class CommandDispatcher {
|
|
for (CommandNode node : rootcommandnode.getChildren()) {
|
|
bukkit.add(node.getName());
|
|
}
|
|
+ // Paper start - Async command map building
|
|
+ MinecraftServer.getServer().execute(() -> {
|
|
+ runSync(entityplayer, bukkit, rootcommandnode);
|
|
+ });
|
|
+ }
|
|
|
|
+ private void runSync(EntityPlayer entityplayer, Collection<String> bukkit, RootCommandNode<ICompletionProvider> rootcommandnode) {
|
|
+ // Paper end - Async command map building
|
|
PlayerCommandSendEvent event = new PlayerCommandSendEvent(entityplayer.getBukkitEntity(), new LinkedHashSet<>(bukkit));
|
|
event.getPlayer().getServer().getPluginManager().callEvent(event);
|
|
|