1
0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-13 11:15:57 -07:00

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
This commit is contained in:
Mariell Hoversholm
2021-03-17 17:37:12 +01:00
parent 597f326302
commit 4ff6e86500
6 changed files with 7 additions and 7 deletions

@@ -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 -->

@@ -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
}

@@ -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>