aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0229-Use-a-Queue-for-Queueing-Commands.patch
diff options
context:
space:
mode:
authorSpottedleaf <[email protected]>2024-07-17 10:24:53 -0700
committerSpottedleaf <[email protected]>2024-07-17 10:28:32 -0700
commit00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6 (patch)
tree82639515bc5e9ae00c1e639e72137ed51e1ac688 /patches/server/0229-Use-a-Queue-for-Queueing-Commands.patch
parent967f98aa81da851740aeb429778e46159fd188df (diff)
downloadPaper-00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6.tar.gz
Paper-00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6.zip
Remove Moonrise utils to MCUtils, remove duplicated/unused utils
Diffstat (limited to 'patches/server/0229-Use-a-Queue-for-Queueing-Commands.patch')
-rw-r--r--patches/server/0229-Use-a-Queue-for-Queueing-Commands.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/server/0229-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0229-Use-a-Queue-for-Queueing-Commands.patch
new file mode 100644
index 0000000000..eee2655478
--- /dev/null
+++ b/patches/server/0229-Use-a-Queue-for-Queueing-Commands.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Sun, 12 Aug 2018 02:33:39 -0400
+Subject: [PATCH] Use a Queue for Queueing Commands
+
+Lists are bad as Queues mmmkay.
+
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+index baf93b5d5883d0a5c360f1a475949804b7907636..b15cee6f21ff300b596922a8eed35a5f8a89fe22 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -78,7 +78,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+ static final Logger LOGGER = LogUtils.getLogger();
+ private static final int CONVERSION_RETRY_DELAY_MS = 5000;
+ private static final int CONVERSION_RETRIES = 2;
+- private final List<ConsoleInput> consoleInput = Collections.synchronizedList(Lists.newArrayList());
++ private final java.util.Queue<ConsoleInput> serverCommandQueue = new java.util.concurrent.ConcurrentLinkedQueue<>(); // Paper - Perf: use a proper queue
+ @Nullable
+ private QueryThreadGs4 queryThreadGs4;
+ // private final RemoteControlCommandListener rconConsoleSource; // CraftBukkit - remove field
+@@ -438,13 +438,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+ }
+
+ public void handleConsoleInput(String command, CommandSourceStack commandSource) {
+- this.consoleInput.add(new ConsoleInput(command, commandSource));
++ this.serverCommandQueue.add(new ConsoleInput(command, commandSource)); // Paper - Perf: use proper queue
+ }
+
+ public void handleConsoleInputs() {
+ MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
+- while (!this.consoleInput.isEmpty()) {
+- ConsoleInput servercommand = (ConsoleInput) this.consoleInput.remove(0);
++ // Paper start - Perf: use proper queue
++ ConsoleInput servercommand;
++ while ((servercommand = this.serverCommandQueue.poll()) != null) {
++ // Paper end - Perf: use proper queue
+
+ // CraftBukkit start - ServerCommand for preprocessing
+ ServerCommandEvent event = new ServerCommandEvent(this.console, servercommand.msg);