mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +01:00
a0b8b886c8
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:
d5a72960 SPIGOT-6063: ConsoleSender sending extra lines in Java 13+
Spigot Changes:
2740d5ae Rebuild patches
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 ac60ed4396b67838ded7c775ca1115eba40d318b..0176b72d8a1b54e57a462272dac16d3416fa7cd8 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 {
|