diff --git a/Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch index c0c78646e..e8c152bdf 100644 --- a/Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch +++ b/Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch @@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're debugging in an IDE pre-relocate. diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index ac48431777b70c200f9e4113c8a0c03957126e90..1d78086cb94d24372f9fbe21463e21277e25eab7 100644 +index 6ccfd49c43d0e896ee0f15dfbe577a541367dab8..21f265e3c6d9952f9e0e9a28f8c8de9ee733bf1e 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -6,7 +6,9 @@ import java.io.FileOutputStream; @@ -82,7 +82,7 @@ index ac48431777b70c200f9e4113c8a0c03957126e90..1d78086cb94d24372f9fbe21463e2127 OptionParser parser = new OptionParser(); @@ -130,15 +173,86 @@ public class Commodore - cr.accept( new ClassVisitor( Opcodes.ASM8, cw ) + cr.accept( new ClassVisitor( Opcodes.ASM9, cw ) { + // Paper start - Rewrite plugins + @Override diff --git a/work/CraftBukkit b/work/CraftBukkit index 221aed6cf..c85efa876 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 221aed6cf5b07b1454cf60231f40a7831ce519e9 +Subproject commit c85efa8767daf863ba854dc451571c46ced9302f