42433c2626
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 Bukkit Changes: 09f10fd9 SPIGOT-5950: Add PrepareSmithingEvent event CraftBukkit Changes: 7c03d257 SPIGOT-6011: End Gateways do not work on Non-Main End Worlds d492e363 SPIGOT-6015: Small Armor Stand doesn't drop items 5db13eea SPIGOT-5950: Add PrepareSmithingEvent event
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 d94d25481000c3cf98affdc2fbdf9fcedbc93d94..2049f9783bf93c56d8c4dcb395293c03f09b5b40 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 > 58.0) {
|
|
System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 14 is supported.");
|
|
- return;
|
|
+ if (!Boolean.getBoolean("Paper.IgnoreJavaVersion")) return; // Paper
|
|
}
|
|
|
|
try {
|