From f77cb8d6c23143329214aacda0b653806c922d85 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sun, 6 Oct 2024 14:38:13 +0200
Subject: [PATCH] Bump asm to 9.7.1 and re-add ClassReader to ClassWriter

By: DerFrZocker <derrieple@gmail.com>
---
 paper-server/pom.xml                                          | 4 ++--
 .../src/main/java/org/bukkit/craftbukkit/util/Commodore.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/paper-server/pom.xml b/paper-server/pom.xml
index da86411b9..411cb525f 100644
--- a/paper-server/pom.xml
+++ b/paper-server/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-commons</artifactId>
-            <version>9.7</version>
+            <version>9.7.1</version>
             <scope>compile</scope>
         </dependency>
         <!-- Mojang depends -->
@@ -296,7 +296,7 @@
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-tree</artifactId>
-            <version>9.7</version>
+            <version>9.7.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
index f68c54e4b..54a2600e3 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
@@ -166,7 +166,7 @@ public class Commodore {
         final boolean modern = pluginVersion.isNewerThanOrSameAs(ApiVersion.FLATTENING);
         final boolean enumCompatibility = pluginVersion.isOlderThanOrSameAs(ApiVersion.getOrCreateVersion("1.20.6")) && activeCompatibilities.contains("enum-compatibility-mode");
         ClassReader cr = new ClassReader(b);
-        ClassWriter cw = new ClassWriter(0); // TODO 2024-06-22: Open PR to ASM to included interface in handle hash
+        ClassWriter cw = new ClassWriter(cr, 0);
 
         List<String> methodEnumSignatures = getMethodSignatures(b);
         Multimap<String, String> enumLessToEnum = HashMultimap.create();