2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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
2023-12-05 23:12:48 +01:00
index adae2d7f9ced8ce6d2e15aafb8b53ef85e79b6d1..90b261b23f6731f60a7d4f412a6bf4c6c6aa7095 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
2022-12-07 20:22:28 +01:00
@@ -69,7 +69,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
2022-06-07 23:45:11 +02:00
static final Logger LOGGER = LogUtils.getLogger();
2021-06-13 01:45:00 +02:00
private static final int CONVERSION_RETRY_DELAY_MS = 5000;
private static final int CONVERSION_RETRIES = 2;
2021-06-11 14:02:28 +02:00
- private final List<ConsoleInput> consoleInput = Collections.synchronizedList(Lists.newArrayList());
2021-11-23 16:04:41 +01:00
+ private final java.util.Queue<ConsoleInput> serverCommandQueue = new java.util.concurrent.ConcurrentLinkedQueue<>(); // Paper - use a proper queuemmands
@Nullable
2021-06-11 14:02:28 +02:00
private QueryThreadGs4 queryThreadGs4;
2023-09-22 00:01:00 +02:00
// private final RemoteControlCommandListener rconConsoleSource; // CraftBukkit - remove field
2023-09-22 22:13:57 +02:00
@@ -439,13 +439,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
return;
}
// Paper end - rewrite chunk system
2021-06-11 14:02:28 +02:00
- this.consoleInput.add(new ConsoleInput(command, commandSource));
2022-09-26 10:02:51 +02:00
+ this.serverCommandQueue.add(new ConsoleInput(command, commandSource)); // Paper - use proper queue
2021-06-11 14:02:28 +02:00
}
public void handleConsoleInputs() {
MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
- while (!this.consoleInput.isEmpty()) {
- ConsoleInput servercommand = (ConsoleInput) this.consoleInput.remove(0);
+ // Paper start - use proper queue
+ ConsoleInput servercommand;
+ while ((servercommand = this.serverCommandQueue.poll()) != null) {
+ // Paper end
// CraftBukkit start - ServerCommand for preprocessing
2023-10-27 01:34:58 +02:00
ServerCommandEvent event = new ServerCommandEvent(this.console, servercommand.msg);