core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix queue patch

This commit is contained in:
Aikar 2018-08-12 02:36:46 -04:00
parent 3830baeb96
commit f8ecb526e7
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Spigot-Server-Patches/0351-Use-a-Queue-for-Queueing-Commands.patch → Spigot-Server-Patches/0336-Use-a-Queue-for-Queueing-Commands.patch
View File

@ -1,4 +1,4 @@
From a606668643e32d55ab47567a218b7c522526db84 Mon Sep 17 00:00:00 2001 From 078e226f1090955d212304acb9c8397a51e48016 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 12 Aug 2018 02:33:39 -0400 Date: Sun, 12 Aug 2018 02:33:39 -0400
Subject: [PATCH] Use a Queue for Queueing Commands Subject: [PATCH] Use a Queue for Queueing Commands
@ -6,21 +6,21 @@ Subject: [PATCH] Use a Queue for Queueing Commands
Lists are bad as Queues mmmkay. 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 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 2922915927..6a8292ce45 100644 index 8e15710caf..eae83ab9f2 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java --- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/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 @@ -39,7 +39,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();
private static final Pattern l = Pattern.compile("^[a-fA-F0-9]{40}$"); 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 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 final java.util.Queue<ServerCommand> serverCommandQueue = new java.util.concurrent.ConcurrentLinkedQueue<>(); // Paper - use a proper queue
private RemoteStatusListener n; private RemoteStatusListener k;
public final RemoteControlCommandListener remoteControlCommandListener = new RemoteControlCommandListener(this); public final RemoteControlCommandListener remoteControlCommandListener = new RemoteControlCommandListener(this);
private RemoteControlListener p; private RemoteControlListener m;
@@ -448,8 +448,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -457,8 +457,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
public void aP() { public void aW() {
MinecraftTimings.serverCommandTimer.startTiming(); // Spigot MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
- while (!this.serverCommandQueue.isEmpty()) { - while (!this.serverCommandQueue.isEmpty()) {
- ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0); - ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);