From 4ff6e865005d091ec5d9dbe9d740861282bfd12e Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Wed, 17 Mar 2021 17:37:12 +0100
Subject: [PATCH] Updated Upstream (Bukkit/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

Bukkit Changes:
4e5f46cb Update ASM version

CraftBukkit Changes:
d54b500d Prepare for Java 16
---
 Spigot-API-Patches/Use-ASM-for-event-executors.patch          | 2 +-
 .../Allow-overriding-the-java-version-check.patch             | 4 ++--
 Spigot-Server-Patches/POM-Changes.patch                       | 2 +-
 work/BuildData                                                | 2 +-
 work/Bukkit                                                   | 2 +-
 work/CraftBukkit                                              | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Spigot-API-Patches/Use-ASM-for-event-executors.patch b/Spigot-API-Patches/Use-ASM-for-event-executors.patch
index 623ae6a81a..57cdbcfe52 100644
--- a/Spigot-API-Patches/Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/Use-ASM-for-event-executors.patch
@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
-             <version>9.0</version>
+             <version>9.1</version>
              <scope>test</scope>
          </dependency>
 +        <!-- ASM -->
diff --git a/Spigot-Server-Patches/Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/Allow-overriding-the-java-version-check.patch
index 7ff9c2c284..9ee5f8b776 100644
--- a/Spigot-Server-Patches/Allow-overriding-the-java-version-check.patch
+++ b/Spigot-Server-Patches/Allow-overriding-the-java-version-check.patch
@@ -11,8 +11,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ public class Main {
              float javaVersion = Float.parseFloat(System.getProperty("java.class.version"));
-             if (javaVersion > 59.0) {
-                 System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 15 is supported.");
+             if (javaVersion > 60.0) {
+                 System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 16 is supported.");
 -                return;
 +                if (!Boolean.getBoolean("Paper.IgnoreJavaVersion")) return; // Paper
              }
diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index a9f227f4ed..8c8b07895c 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -62,7 +62,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              <version>${minecraft.version}-SNAPSHOT</version>
              <scope>compile</scope>
 @@ -0,0 +0,0 @@
-             <version>9.0</version>
+             <version>9.1</version>
              <scope>compile</scope>
          </dependency>
 +        <dependency>
diff --git a/work/BuildData b/work/BuildData
index 80d35549ec..f0a5ed1aef 160000
--- a/work/BuildData
+++ b/work/BuildData
@@ -1 +1 @@
-Subproject commit 80d35549ec67b87a0cdf0d897abbe826ba34ac27
+Subproject commit f0a5ed1aeff8156ba4afa504e190c838dd1af50c
diff --git a/work/Bukkit b/work/Bukkit
index c589f5464d..4e5f46cb27 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c589f5464d0c822a21ffff763af526ef4ecfb243
+Subproject commit 4e5f46cb2741c3f898de399e2a936b8b254ba211
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 90d6905b15..d54b500db2 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 90d6905b1587ac1c5c075e2da471f77d00e0f50d
+Subproject commit d54b500db251576dd8bbd380ad72ca87cd86da0e