diff --git a/Spigot-Server-Patches/0385-Dont-strip-explicit-leading-color-codes-in-chat-comp.patch b/Spigot-Server-Patches/0385-Dont-strip-explicit-leading-color-codes-in-chat-comp.patch
deleted file mode 100644
index 13c7a45eb5..0000000000
--- a/Spigot-Server-Patches/0385-Dont-strip-explicit-leading-color-codes-in-chat-comp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 82ea8869162c7265deb6fd29053df64e31e786e2 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 30 Sep 2018 08:40:14 -0500
-Subject: [PATCH] Dont strip explicit leading color codes in chat components
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index 5e20a9a61..df627d955 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-@@ -192,7 +192,7 @@ public final class CraftChatMessage {
-             }
-             out.append(c.getText());
-         }
--        return out.toString().replaceFirst("^(" + defaultColor + ")*", "");
-+        return out.toString().replaceFirst("^(" + defaultColor + ")", ""); // Paper - GH-1484
-     }
- 
-     public static IChatBaseComponent fixComponent(IChatBaseComponent component) {
--- 
-2.19.0
-
diff --git a/Spigot-Server-Patches/0386-Fix-FileIOThread-concurrency-issues.patch b/Spigot-Server-Patches/0385-Fix-FileIOThread-concurrency-issues.patch
similarity index 94%
rename from Spigot-Server-Patches/0386-Fix-FileIOThread-concurrency-issues.patch
rename to Spigot-Server-Patches/0385-Fix-FileIOThread-concurrency-issues.patch
index f122647c3b..eabb9c0a70 100644
--- a/Spigot-Server-Patches/0386-Fix-FileIOThread-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0385-Fix-FileIOThread-concurrency-issues.patch
@@ -1,4 +1,4 @@
-From c829c08588842173ed4ce8d43a61f25e2a6a848c Mon Sep 17 00:00:00 2001
+From e6174b677b73ca1e2b00dba04697ea49e20b773f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 3 Oct 2018 19:04:53 +0100
 Subject: [PATCH] Fix FileIOThread concurrency issues
@@ -9,7 +9,7 @@ issues when this counter is updated from multiple threads, potentially
 causing these counters to desync due to the unsafe volatile update
 
 diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java
-index 97917551..1959bc06 100644
+index 97917551a4..1959bc0660 100644
 --- a/src/main/java/net/minecraft/server/FileIOThread.java
 +++ b/src/main/java/net/minecraft/server/FileIOThread.java
 @@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger;