2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 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
|
2020-08-25 02:22:08 +00:00
|
|
|
index ea7f7f4a97ed5e1b878ec6ba2976bafbeb063df2..b197aa44307aca7f0385ae9d2f5622e72bbffc0f 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
|
2020-06-25 14:09:55 +00:00
|
|
|
@@ -38,7 +38,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
2018-08-12 06:34:34 +00:00
|
|
|
|
|
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
2020-06-25 14:09:55 +00:00
|
|
|
private static final Pattern k = Pattern.compile("^[a-fA-F0-9]{40}$");
|
2018-12-17 05:18:06 +00:00
|
|
|
- private final List<ServerCommand> serverCommandQueue = Collections.synchronizedList(Lists.newArrayList());
|
2020-06-25 14:09:55 +00:00
|
|
|
+ private final java.util.Queue<ServerCommand> serverCommandQueue = new java.util.concurrent.ConcurrentLinkedQueue<>(); // Paper - use a proper queue
|
2019-06-25 01:47:58 +00:00
|
|
|
private RemoteStatusListener remoteStatusListener;
|
2019-05-05 02:23:25 +00:00
|
|
|
public final RemoteControlCommandListener remoteControlCommandListener;
|
|
|
|
private RemoteControlListener remoteControlListener;
|
2020-08-25 02:22:08 +00:00
|
|
|
@@ -393,8 +393,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);
|