twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-06 15:12:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bump asm to 9.7.1 and re-add ClassReader to ClassWriter

Browse Source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
CraftBukkit/Spigot
2024-10-06 14:38:13 +02:00
parent adf5fecbbb
commit f77cb8d6c2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/pom.xml
View File

@@ -54,7 +54,7 @@
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId> <artifactId>asm-commons</artifactId>
<version>9.7</version> <version>9.7.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- Mojang depends --> <!-- Mojang depends -->
@@ -296,7 +296,7 @@
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId> <artifactId>asm-tree</artifactId>
<version>9.7</version> <version>9.7.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
paper-server/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
View File

@@ -166,7 +166,7 @@ public class Commodore {
final boolean modern = pluginVersion.isNewerThanOrSameAs(ApiVersion.FLATTENING); final boolean modern = pluginVersion.isNewerThanOrSameAs(ApiVersion.FLATTENING);
final boolean enumCompatibility = pluginVersion.isOlderThanOrSameAs(ApiVersion.getOrCreateVersion("1.20.6")) && activeCompatibilities.contains("enum-compatibility-mode"); final boolean enumCompatibility = pluginVersion.isOlderThanOrSameAs(ApiVersion.getOrCreateVersion("1.20.6")) && activeCompatibilities.contains("enum-compatibility-mode");
ClassReader cr = new ClassReader(b); 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); List<String> methodEnumSignatures = getMethodSignatures(b);
Multimap<String, String> enumLessToEnum = HashMultimap.create(); Multimap<String, String> enumLessToEnum = HashMultimap.create();