diff --git a/Spigot-API-Patches/Add-Force-Loaded-Chunk-API.patch b/Spigot-API-Patches/Add-Force-Loaded-Chunk-API.patch
index cb859e75fe..78fbba76d7 100644
--- a/Spigot-API-Patches/Add-Force-Loaded-Chunk-API.patch
+++ b/Spigot-API-Patches/Add-Force-Loaded-Chunk-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Force-Loaded Chunk API
 
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index dc847340..51bc051f 100644
+index dc847340f..51bc051f7 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -0,0 +0,0 @@ public interface Chunk {
@@ -30,7 +30,7 @@ index dc847340..51bc051f 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 53764fae..00b02e36 100644
+index 53764fae6..00b02e36f 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -50,6 +50,4 @@ index 53764fae..00b02e36 100644
      // Paper end
  
      /**
--- 
-2.19.0.rc1
-
+--
\ No newline at end of file
diff --git a/Spigot-API-Patches/Add-More-Creeper-API.patch b/Spigot-API-Patches/Add-More-Creeper-API.patch
index 3e56f5241b..c8e76176f7 100644
--- a/Spigot-API-Patches/Add-More-Creeper-API.patch
+++ b/Spigot-API-Patches/Add-More-Creeper-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add More Creeper API
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
 new file mode 100644
-index 00000000..3d10bb03
+index 000000000..3d10bb039
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
 @@ -0,0 +0,0 @@
@@ -61,7 +61,7 @@ index 00000000..3d10bb03
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java
-index f957d836..b9877fb8 100644
+index f957d8368..b9877fb88 100644
 --- a/src/main/java/org/bukkit/entity/Creeper.java
 +++ b/src/main/java/org/bukkit/entity/Creeper.java
 @@ -0,0 +0,0 @@ public interface Creeper extends Monster {
diff --git a/Spigot-API-Patches/Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/Add-ray-tracing-methods-to-LivingEntity.patch
index b9f21cb0e5..e8874ae36b 100644
--- a/Spigot-API-Patches/Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-API-Patches/Add-ray-tracing-methods-to-LivingEntity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
 new file mode 100644
-index 00000000..fe43d955
+index 000000000..fe43d9557
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
 @@ -0,0 +0,0 @@
@@ -61,7 +61,7 @@ index 00000000..fe43d955
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ac5bd8a5..62e45eda 100644
+index ac5bd8a57..62e45eda2 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
diff --git a/Spigot-API-Patches/Improve-death-events.patch b/Spigot-API-Patches/Improve-death-events.patch
index 63c744285f..d75e5fec81 100644
--- a/Spigot-API-Patches/Improve-death-events.patch
+++ b/Spigot-API-Patches/Improve-death-events.patch
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
-index ab9e81fd..a7b8f869 100644
+index ab9e81fd2..a7b8f869c 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
 @@ -0,0 +0,0 @@ import org.bukkit.inventory.ItemStack;
diff --git a/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch
index 9b948d78f1..ada45a3bee 100644
--- a/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch
+++ b/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch
@@ -78,4 +78,43 @@ index cb2b0b9cb..a7dd902fb 100644
          HandlerList handlers = event.getHandlers();
          RegisteredListener[] listeners = handlers.getRegisteredListeners();
  
+diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
+index 6b86128e1..56308c0c6 100644
+--- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
++++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
+@@ -0,0 +0,0 @@ public class PluginManagerTest {
+     private static final PluginManager pm = TestServer.getInstance().getPluginManager();
+ 
+     private final MutableObject store = new MutableObject();
+-
++/* // Paper start - remove unneeded test
+     @Test
+     public void testAsyncSameThread() {
+         final Event event = new TestEvent(true);
+@@ -0,0 +0,0 @@ public class PluginManagerTest {
+             return;
+         }
+         throw new IllegalStateException("No exception thrown");
+-    }
++    }*/ // Paper end
+ 
+     @Test
+     public void testSyncSameThread() {
+         final Event event = new TestEvent(false);
+         pm.callEvent(event);
+     }
+-
++/* // Paper start - remove unneeded test
+     @Test
+     public void testAsyncLocked() throws InterruptedException {
+         final Event event = new TestEvent(true);
+@@ -0,0 +0,0 @@ public class PluginManagerTest {
+         secondThread.join();
+         assertThat(store.value, is(instanceOf(IllegalStateException.class)));
+         assertThat(event.getEventName() + " cannot be triggered asynchronously from inside synchronized code.", is(((Throwable) store.value).getMessage()));
+-    }
++    }*/ // Paper end
+ 
+     @Test
+     public void testAsyncUnlocked() throws InterruptedException {
 --
\ No newline at end of file