aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0350-Use-a-Queue-for-Queueing-Commands.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0350-Use-a-Queue-for-Queueing-Commands.patch')
-rw-r--r--Spigot-Server-Patches/0350-Use-a-Queue-for-Queueing-Commands.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0350-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0350-Use-a-Queue-for-Queueing-Commands.patch
new file mode 100644
index 0000000000..6a7b35d7d8
--- /dev/null
+++ b/Spigot-Server-Patches/0350-Use-a-Queue-for-Queueing-Commands.patch
@@ -0,0 +1,36 @@
+From d8ae95e1197458e374253152f54a1df259068bb2 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+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
+index 29229159..6a8292ce 100644
+--- a/src/main/java/net/minecraft/server/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/DedicatedServer.java
+@@ -34,7 +34,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+
+ private static final Logger LOGGER = LogManager.getLogger();
+ private static final Pattern l = Pattern.compile("^[a-fA-F0-9]{40}$");
+- private final List<ServerCommand> serverCommandQueue = Collections.synchronizedList(Lists.<ServerCommand>newArrayList()); // CraftBukkit - fix decompile error
++ private final java.util.Queue<ServerCommand> serverCommandQueue = new java.util.concurrent.ConcurrentLinkedQueue<>(); // Paper - use a proper queue
+ private RemoteStatusListener n;
+ public final RemoteControlCommandListener remoteControlCommandListener = new RemoteControlCommandListener(this);
+ private RemoteControlListener p;
+@@ -448,8 +448,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+
+ public void aP() {
+ 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);
+--
+2.19.1
+