testserver/Spigot-Server-Patches/0336-Use-a-Queue-for-Queuei...

37 lines
1.9 KiB
Diff
Raw Normal View History

2018-08-12 06:36:46 +00:00
From 078e226f1090955d212304acb9c8397a51e48016 Mon Sep 17 00:00:00 2001
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
2018-08-12 06:36:46 +00:00
index 8e15710caf..eae83ab9f2 100644
--- 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
private static final Logger LOGGER = LogManager.getLogger();
2018-08-12 06:36:46 +00:00
private static final Pattern i = 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
2018-08-12 06:36:46 +00:00
private RemoteStatusListener k;
public final RemoteControlCommandListener remoteControlCommandListener = new RemoteControlCommandListener(this);
2018-08-12 06:36:46 +00:00
private RemoteControlListener m;
@@ -457,8 +457,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2018-08-12 06:36:46 +00:00
public void aW() {
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.18.0