2019-07-20 12:01:24 +08:00
From 5fb2815537295ce5488fe268c3022169bee43f12 Mon Sep 17 00:00:00 2001
2018-08-12 14:34:34 +08: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-07-20 12:01:24 +08:00
index 118d90242e..6da54a64bd 100644
2018-08-12 14:34:34 +08:00
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
2019-06-25 09:47:58 +08:00
@@ -43,7 +43,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2018-08-12 14:34:34 +08:00
private static final Logger LOGGER = LogManager.getLogger();
2019-06-25 09:47:58 +08:00
private static final Pattern i = Pattern.compile("^[a-fA-F0-9]{40}$");
2018-12-17 13:18:06 +08: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 09:47:58 +08:00
private RemoteStatusListener remoteStatusListener;
2019-05-05 10:23:25 +08:00
public final RemoteControlCommandListener remoteControlCommandListener;
private RemoteControlListener remoteControlListener;
2019-06-25 09:47:58 +08:00
@@ -444,8 +444,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2018-08-12 14:34:34 +08:00
2018-12-17 13:18:06 +08:00
public void handleCommandQueue() {
2018-08-12 14:34:34 +08: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-06-25 09:47:58 +08:00
2.22.0
2018-08-12 14:34:34 +08:00