2020-01-24 22:30:15 +01:00
From 5632d26dd961b00051930945ccc100df3d16b34f Mon Sep 17 00:00:00 2001
2018-08-12 08:34:34 +02: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
2020-01-24 22:30:15 +01:00
index 0411fb3ee..a74fae9ed 100644
2018-08-12 08:34:34 +02:00
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
2020-01-22 03:02:07 +01:00
@@ -44,7 +44,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2018-08-12 08:34:34 +02:00
private static final Logger LOGGER = LogManager.getLogger();
2019-06-25 03:47:58 +02:00
private static final Pattern i = Pattern.compile("^[a-fA-F0-9]{40}$");
2018-12-17 06:18:06 +01: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
2019-06-25 03:47:58 +02:00
private RemoteStatusListener remoteStatusListener;
2019-05-05 04:23:25 +02:00
public final RemoteControlCommandListener remoteControlCommandListener;
private RemoteControlListener remoteControlListener;
2020-01-24 22:30:15 +01:00
@@ -447,8 +447,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2018-08-12 08:34:34 +02:00
2018-12-17 06:18:06 +01:00
public void handleCommandQueue() {
2018-08-12 08:34:34 +02: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);
--
2020-01-24 22:30:15 +01:00
2.25.0.windows.1
2018-08-12 08:34:34 +02:00