2019-01-01 03:15:55 +00:00
From a3b684b2cea02f3a33fa08ececd3e786778c6d97 Mon Sep 17 00:00:00 2001
2018-08-12 06:34:34 +00:00
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/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
2019-01-01 03:15:55 +00:00
index 3062d3e20..67690561b 100644
2018-08-12 06:34:34 +00:00
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
2018-08-12 06:36:46 +00:00
@@ -39,7 +39,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2018-08-12 06:34:34 +00:00
private static final Logger LOGGER = LogManager.getLogger();
2018-08-26 18:11:49 +00:00
private static final Pattern h = Pattern.compile("^[a-fA-F0-9]{40}$");
2018-12-17 05:18:06 +00:00
- private final List<ServerCommand> serverCommandQueue = Collections.synchronizedList(Lists.newArrayList());
+ private final java.util.Queue<ServerCommand> serverCommandQueue = new java.util.concurrent.ConcurrentLinkedQueue<ServerCommand>(); // Paper - use a proper queue
2018-08-26 18:11:49 +00:00
private RemoteStatusListener j;
2018-08-12 06:34:34 +00:00
public final RemoteControlCommandListener remoteControlCommandListener = new RemoteControlCommandListener(this);
2018-08-26 18:11:49 +00:00
private RemoteControlListener l;
2018-10-19 00:44:59 +00:00
@@ -468,8 +468,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2018-08-12 06:34:34 +00:00
2018-12-17 05:18:06 +00:00
public void handleCommandQueue() {
2018-08-12 06:34:34 +00:00
MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
- while (!this.serverCommandQueue.isEmpty()) {
- ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
+ // Paper start - use proper queue
+ ServerCommand servercommand;
+ while ((servercommand = this.serverCommandQueue.poll()) != null) {
+ // Paper end
// CraftBukkit start - ServerCommand for preprocessing
ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command);
--
2019-01-01 03:15:55 +00:00
2.20.1
2018-08-12 06:34:34 +00:00