13
0
geforkt von Mirrors/Paper

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
Dieser Commit ist enthalten in:
Mariell Hoversholm 2021-03-17 17:37:12 +01:00
Ursprung 597f326302
Commit 4ff6e86500
6 geänderte Dateien mit 7 neuen und 7 gelöschten Zeilen

Datei anzeigen

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

Datei anzeigen

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

Datei anzeigen

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

@ -1 +1 @@
Subproject commit 80d35549ec67b87a0cdf0d897abbe826ba34ac27
Subproject commit f0a5ed1aeff8156ba4afa504e190c838dd1af50c

@ -1 +1 @@
Subproject commit c589f5464d0c822a21ffff763af526ef4ecfb243
Subproject commit 4e5f46cb2741c3f898de399e2a936b8b254ba211

@ -1 +1 @@
Subproject commit 90d6905b1587ac1c5c075e2da471f77d00e0f50d
Subproject commit d54b500db251576dd8bbd380ad72ca87cd86da0e