From 3db3aaf393709cd7d0e59b6c24ab7170c5b2942e Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 7 Apr 2021 04:57:26 -0400 Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: c85efa876 SPIGOT-6414: Use ASM9 API to add support for sealed classes --- Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch | 4 ++-- work/CraftBukkit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 c0c78646ef..e8c152bdfa 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 221aed6cf5..c85efa8767 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 221aed6cf5b07b1454cf60231f40a7831ce519e9 +Subproject commit c85efa8767daf863ba854dc451571c46ced9302f