diff --git a/Spigot-Server-Patches/0351-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0336-Use-a-Queue-for-Queueing-Commands.patch
similarity index 80%
rename from Spigot-Server-Patches/0351-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0336-Use-a-Queue-for-Queueing-Commands.patch
index 50f0c6725..f17fdbce4 100644
--- a/Spigot-Server-Patches/0351-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0336-Use-a-Queue-for-Queueing-Commands.patch
@@ -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>
 Date: Sun, 12 Aug 2018 02:33:39 -0400
 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.
 
 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
 +++ 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 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 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);
-     private RemoteControlListener p;
-@@ -448,8 +448,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+     private RemoteControlListener m;
+@@ -457,8 +457,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
  
-     public void aP() {
+     public void aW() {
          MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
 -        while (!this.serverCommandQueue.isEmpty()) {
 -            ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);