diff --git a/Spigot-Server-Patches/Cap-Entity-Collisions.patch b/Spigot-Server-Patches/Cap-Entity-Collisions.patch
index c9e02be9aa..493d570945 100644
--- a/Spigot-Server-Patches/Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/Cap-Entity-Collisions.patch
@@ -27,7 +27,7 @@ index 70af657f5..af953dda4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7339e337b..883777223 100644
+index 127eaf1f6..d54116be3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
diff --git a/Spigot-Server-Patches/Change-Outdated-Build-Download-URL-to-Paper-CI.patch b/Spigot-Server-Patches/Change-Outdated-Build-Download-URL-to-Paper-CI.patch
deleted file mode 100644
index bbc4773993..0000000000
--- a/Spigot-Server-Patches/Change-Outdated-Build-Download-URL-to-Paper-CI.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 29 Dec 2016 00:56:51 -0500
-Subject: [PATCH] Change Outdated Build Download URL to Paper CI
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 507390c4b..dab983481 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -0,0 +0,0 @@ public class Main {
-                     deadline.add(Calendar.DAY_OF_YEAR, -3);
-                     if (buildDate.before(deadline.getTime())) {
-                         System.err.println("*** Error, this build is outdated ***");
--                        System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***");
-+                        System.err.println("*** Please download a new build as per instructions from https://paperci.emc.gs/ ***"); // Paper
-                         System.err.println("*** Server will start in 15 seconds ***");
-                         Thread.sleep(TimeUnit.SECONDS.toMillis(15));
-                     }
---
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch
index 61a8ef7156..3b81a5fe6e 100644
--- a/Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 902df7ac6..7339e337b 100644
+index 0a3d1969a..127eaf1f6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
diff --git a/Spigot-Server-Patches/PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/PlayerTeleportEndGatewayEvent.patch
index f52fe42df8..28d23675b5 100644
--- a/Spigot-Server-Patches/PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/PlayerTeleportEndGatewayEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index f9590d4c4..82c1a37ed 100644
+index 9bde14d93..ab2cd1760 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -0,0 +0,0 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 6156d632c3..2ff5b1eb08 100644
--- a/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -45,6 +45,23 @@ index 5c05ae407..bfc42b12f 100644
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 30b6f3477..22cb680df 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -0,0 +0,0 @@ public class Main {
+                     Date buildDate = new SimpleDateFormat("yyyyMMdd-HHmm").parse(Main.class.getPackage().getImplementationVendor());
+ 
+                     Calendar deadline = Calendar.getInstance();
+-                    deadline.add(Calendar.DAY_OF_YEAR, -3);
++                    deadline.add(Calendar.DAY_OF_YEAR, -14); // Paper - Bump back to 14
+                     if (buildDate.before(deadline.getTime())) {
+                         System.err.println("*** Error, this build is outdated ***");
+-                        System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***");
++                        System.err.println("*** Please download a new build as per instructions from https://paperci.emc.gs/ ***"); // Paper
+                         System.err.println("*** Server will start in 15 seconds ***");
+                         Thread.sleep(TimeUnit.SECONDS.toMillis(15));
+                     }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
 index 94a3d4237..3ed983cc0 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
diff --git a/Spigot-Server-Patches/Workaround-for-jansi-bug-with-Windows.patch b/Spigot-Server-Patches/Workaround-for-jansi-bug-with-Windows.patch
index 85cc77012e..2ad8efbe91 100644
--- a/Spigot-Server-Patches/Workaround-for-jansi-bug-with-Windows.patch
+++ b/Spigot-Server-Patches/Workaround-for-jansi-bug-with-Windows.patch
@@ -13,7 +13,7 @@ still keep our versions the same as they were, we set the override property to t
 Paper. This version is only used when extracting the libraries to their temp folder.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index dab983481..20902dc38 100644
+index 1cbcc3dfa..98e27fa25 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ public class Main {