2021-06-11 14:02:28 +02:00
|
|
|
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
|
|
|
|
|
2022-08-08 13:32:17 +02:00
|
|
|
This adds a custom pool inorder to make sure that they are closed
|
|
|
|
without much though, as it doesn't matter if the client is not sent
|
|
|
|
commands if the server is restarting. Using the default async pool caused issues to arise
|
|
|
|
due to the shutdown logic generally being much later.
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
|
2022-08-10 05:51:17 +02:00
|
|
|
index 2bf67468a6c745bc6243c65210477ba129bfcb07..c4315531f93f4ed68b4621157b02572886e1ed30 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/commands/Commands.java
|
|
|
|
+++ b/src/main/java/net/minecraft/commands/Commands.java
|
2022-08-10 05:51:17 +02:00
|
|
|
@@ -360,6 +360,24 @@ public class Commands {
|
2021-06-11 14:02:28 +02:00
|
|
|
if ( org.spigotmc.SpigotConfig.tabComplete < 0 ) return; // Spigot
|
|
|
|
// CraftBukkit start
|
|
|
|
// Register Vanilla commands into builtRoot as before
|
|
|
|
+ // Paper start - Async command map building
|
2022-08-08 13:32:17 +02:00
|
|
|
+ COMMAND_SENDING_POOL.execute(() -> {
|
|
|
|
+ this.sendAsync(player);
|
|
|
|
+ });
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
2022-08-08 13:32:17 +02:00
|
|
|
+ public static final java.util.concurrent.ThreadPoolExecutor COMMAND_SENDING_POOL = new java.util.concurrent.ThreadPoolExecutor(
|
|
|
|
+ 0, 2, 60L, java.util.concurrent.TimeUnit.SECONDS,
|
|
|
|
+ new java.util.concurrent.LinkedBlockingQueue<>(),
|
|
|
|
+ new com.google.common.util.concurrent.ThreadFactoryBuilder()
|
|
|
|
+ .setNameFormat("Paper Async Command Builder Thread Pool - %1$d")
|
|
|
|
+ .setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER))
|
2022-08-10 05:51:17 +02:00
|
|
|
+ .build(),
|
|
|
|
+ new java.util.concurrent.ThreadPoolExecutor.DiscardPolicy()
|
2022-08-08 13:32:17 +02:00
|
|
|
+ );
|
|
|
|
+
|
2021-08-26 18:41:22 +02:00
|
|
|
+ private void sendAsync(ServerPlayer player) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end - Async command map building
|
|
|
|
Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> map = Maps.newIdentityHashMap(); // Use identity to prevent aliasing issues
|
|
|
|
RootCommandNode vanillaRoot = new RootCommandNode();
|
|
|
|
|
2022-08-10 05:51:17 +02:00
|
|
|
@@ -377,7 +395,14 @@ public class Commands {
|
2021-06-11 14:02:28 +02:00
|
|
|
for (CommandNode node : rootcommandnode.getChildren()) {
|
|
|
|
bukkit.add(node.getName());
|
|
|
|
}
|
|
|
|
+ // Paper start - Async command map building
|
2022-08-08 13:32:17 +02:00
|
|
|
+ net.minecraft.server.MinecraftServer.getServer().execute(() -> {
|
2021-08-26 18:41:22 +02:00
|
|
|
+ runSync(player, bukkit, rootcommandnode);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
|
2021-08-26 18:41:22 +02:00
|
|
|
+ private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end - Async command map building
|
2021-08-26 18:41:22 +02:00
|
|
|
PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
|
2021-06-11 14:02:28 +02:00
|
|
|
event.getPlayer().getServer().getPluginManager().callEvent(event);
|
|
|
|
|
2022-08-08 13:32:17 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2022-12-07 17:46:46 +01:00
|
|
|
index 1dcc7d93038cd0be45ba871c23225395e4751df4..ddd7f78314275e054a1437b633458d8564ef28ca 100644
|
2022-08-08 13:32:17 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2022-09-26 10:02:51 +02:00
|
|
|
@@ -889,6 +889,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2022-08-08 13:32:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
MinecraftServer.LOGGER.info("Stopping server");
|
|
|
|
+ Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
|
|
|
|
MinecraftTimings.stopServer(); // Paper
|
|
|
|
// CraftBukkit start
|
|
|
|
if (this.server != null) {
|