mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
654b792caf
Upstream has released updates that appears 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:a339310c
#755: Fix NPE when calling getInventory() for virtual EnderChests2577f9bf
Increase outdated build delay1dabfdc8
#754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures
20 lines
984 B
Diff
20 lines
984 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach@zachbr.io>
|
|
Date: Sat, 8 Feb 2020 18:02:24 -0600
|
|
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 ba949818493369c02d06d33d77a992c8ee8f457f..2befc5904249abb0461bac3305186de728d5b81d 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.");
|
|
- return;
|
|
+ if (!Boolean.getBoolean("Paper.IgnoreJavaVersion")) return; // Paper
|
|
}
|
|
|
|
try {
|