Fix 2 plugin specific issues with loot drop and pathfinders

Based on what that collection does, won't really cause any real issue for UC.
So let it silently be ignored.

Fixes #3269
Fixes #3255
This commit is contained in:
Aikar
2020-05-01 21:44:06 -04:00
parent df7e6433ad
commit 8a3c4f1d42
4 changed files with 24 additions and 39 deletions

View File

@@ -7,8 +7,21 @@ Allows us to do fun stuff like rewrite the OBC util fastutil location to
our own relocation. Also lets us rewrite NMS calls for when we're
debugging in an IDE pre-relocate.
diff --git a/pom.xml b/pom.xml
index fd417a9eeb..bc8438ae1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>7.3.1</version>
+ <version>8.0.1</version> <!-- Paper -->
<scope>compile</scope>
</dependency>
<!-- deprecated API depend -->
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
index 9b4a0f0678..2c6814f131 100644
index 9b4a0f0678..4ae41fd255 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
@@ -0,0 +0,0 @@ import java.io.FileOutputStream;
@@ -81,8 +94,11 @@ index 9b4a0f0678..2c6814f131 100644
{
OptionParser parser = new OptionParser();
@@ -0,0 +0,0 @@ public class Commodore
ClassReader cr = new ClassReader( b );
ClassWriter cw = new ClassWriter( cr, 0 );
cr.accept( new ClassVisitor( Opcodes.ASM7, cw )
- cr.accept( new ClassVisitor( Opcodes.ASM7, cw )
+ cr.accept( new ClassVisitor( Opcodes.ASM8, cw) // Paper
{
+ // Paper start - Rewrite plugins
+ @Override