diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch
index 8146a9afa0..0c8802d108 100644
--- a/Spigot-API-Patches/0001-POM-changes.patch
+++ b/Spigot-API-Patches/0001-POM-changes.patch
@@ -1,11 +1,11 @@
-From 61a761e78f673768b70af90087e6d52a7b4ec345 Mon Sep 17 00:00:00 2001
+From 2b5e59d5fc6cb5073abf121c11010c2f16787f2b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 00:16:08 +0100
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 186405ba..1b6204ed 100644
+index 186405ba..9975ba9a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -2,34 +2,28 @@
@@ -85,7 +85,14 @@ index 186405ba..1b6204ed 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -113,6 +125,7 @@
+@@ -107,12 +119,13 @@
+         <dependency>
+             <groupId>org.ow2.asm</groupId>
+             <artifactId>asm-tree</artifactId>
+-            <version>7.3.1</version>
++            <version>8.0.1</version> <!-- Paper -->
+             <scope>test</scope>
+         </dependency>
      </dependencies>
  
      <build>
@@ -113,5 +120,5 @@ index 186405ba..1b6204ed 100644
                      <shadedArtifactAttached>true</shadedArtifactAttached>
                  </configuration>
 -- 
-2.26.2
+2.26.1
 
diff --git a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
index 5438a662eb..f49571fa2e 100644
--- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
@@ -1,4 +1,4 @@
-From 070befa47c5a599596a610780baaa6cfff261237 Mon Sep 17 00:00:00 2001
+From a1eaf7d5b1995612788c21b799931fd7af0fa46c Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -6,30 +6,30 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 3cfbff14b..3712b70bc 100644
+index e8d9982b..661d109f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -128,6 +128,17 @@
-             <version>7.3.1</version>
+             <version>8.0.1</version> <!-- Paper -->
              <scope>test</scope>
          </dependency>
 +        <!-- ASM -->
 +        <dependency>
 +            <groupId>org.ow2.asm</groupId>
 +            <artifactId>asm</artifactId>
-+            <version>7.3.1</version>
++            <version>8.0.1</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.ow2.asm</groupId>
 +            <artifactId>asm-commons</artifactId>
-+            <version>7.3.1</version>
++            <version>8.0.1</version>
 +        </dependency>
      </dependencies>
  
      <build>
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
-index 000000000..5b28e9b1d
+index 00000000..5b28e9b1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 @@ -0,0 +1,42 @@
@@ -77,7 +77,7 @@ index 000000000..5b28e9b1d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 new file mode 100644
-index 000000000..c83672427
+index 00000000..c8367242
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 @@ -0,0 +1,43 @@
@@ -126,7 +126,7 @@ index 000000000..c83672427
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 new file mode 100644
-index 000000000..b6e7d8ee8
+index 00000000..b6e7d8ee
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 @@ -0,0 +1,47 @@
@@ -179,7 +179,7 @@ index 000000000..b6e7d8ee8
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 new file mode 100644
-index 000000000..beed9e6e0
+index 00000000..beed9e6e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 @@ -0,0 +1,35 @@
@@ -220,7 +220,7 @@ index 000000000..beed9e6e0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 new file mode 100644
-index 000000000..ac99477e9
+index 00000000..ac99477e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 @@ -0,0 +1,66 @@
@@ -292,7 +292,7 @@ index 000000000..ac99477e9
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 new file mode 100644
-index 000000000..72e48e8ef
+index 00000000..72e48e8e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 @@ -0,0 +1,35 @@
@@ -332,7 +332,7 @@ index 000000000..72e48e8ef
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index a850f0780..9026e108c 100644
+index a850f078..9026e108 100644
 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java
 +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
 @@ -5,9 +5,75 @@ import org.bukkit.event.EventException;
@@ -412,7 +412,7 @@ index a850f0780..9026e108c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 5cc37eeed..e72cbde4b 100644
+index 5cc37eee..e72cbde4 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -300,21 +300,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -439,5 +439,5 @@ index 5cc37eeed..e72cbde4b 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 -- 
-2.25.1
+2.26.1