From c310f0a6108088316ac29191955a25b2569d127b 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/0023-Use-ASM-for-event-executors.patch   | 4 ++--
 Spigot-Server-Patches/0001-POM-Changes.patch                | 6 +++---
 .../0406-Allow-overriding-the-java-version-check.patch      | 6 +++---
 work/BuildData                                              | 2 +-
 work/Bukkit                                                 | 2 +-
 work/CraftBukkit                                            | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
index 618131cd6f..e54e92b274 100644
--- a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
@@ -6,11 +6,11 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 9e9aa8efe9f2d74f32c22dbd3cc5ed6dedf2ad1a..89918b5af7fbf42357e96dffb00b8a011a8ef13c 100644
+index 75b2830340051deb0fa39149e80872d2b88ed6f0..c3d65e441f5c26b6c6b10f4924504d8f3837e674 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -143,6 +143,17 @@
-             <version>9.0</version>
+             <version>9.1</version>
              <scope>test</scope>
          </dependency>
 +        <!-- ASM -->
diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index bc114ceb5f..4e732ee3f9 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index a31f1513a90c753deba35320a6698a933bc9782f..2559c83c1b811177ade56537aeab1982ac53ee67 100644
+index ebce3da9abf550089ead322bc2cef359c803a434..ce140ae236f97c1a1028e46e562e2c5c78e2fceb 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -62,7 +62,7 @@ index a31f1513a90c753deba35320a6698a933bc9782f..2559c83c1b811177ade56537aeab1982
              <version>${minecraft.version}-SNAPSHOT</version>
              <scope>compile</scope>
 @@ -64,6 +69,17 @@
-             <version>9.0</version>
+             <version>9.1</version>
              <scope>compile</scope>
          </dependency>
 +        <dependency>
@@ -198,7 +198,7 @@ index a31f1513a90c753deba35320a6698a933bc9782f..2559c83c1b811177ade56537aeab1982
                      <dependency>
                          <groupId>org.codehaus.plexus</groupId>
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 60ede7442b2d9a63fcd765aff29a96c9130aebac..3f52c19b6b797e26b3dcedcec2afd28c478e7091 100644
+index 036c870d991118e5c09eced8485b94579bc6782a..c6417a0594ffe2d3650ec54d44e575e347a1f724 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -186,7 +186,7 @@ public class Main {
diff --git a/Spigot-Server-Patches/0406-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0406-Allow-overriding-the-java-version-check.patch
index 12df57bded..3f15011d16 100644
--- a/Spigot-Server-Patches/0406-Allow-overriding-the-java-version-check.patch
+++ b/Spigot-Server-Patches/0406-Allow-overriding-the-java-version-check.patch
@@ -6,13 +6,13 @@ Subject: [PATCH] Allow overriding the java version check
 -DPaper.IgnoreJavaVersion=true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 6095e6ef45f6e2c1188a623192362f8879f5fcd9..67331fa5463dd31e4aea3aebf6204ec5cb43d99e 100644
+index 7d7b9984b867461b0a1025e5ec21ff7798281b8f..100772ba60cb7e717c5e626a4d7b44c15375b0e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -175,7 +175,7 @@ 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/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