mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 06:24:06 +01:00
bc127ea819
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: eec4aab0 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent 205213c6 SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron CraftBukkit Changes: b8c522d5 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent f04a77dc SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron d1dbcebc SPIGOT-6653: Canceling snow bucket placement removes snow from bucket 4f34a67b #891: Fix scheduler task ID overflow and duplication issues Spigot Changes: d03d7f12 BUILDTOOLS-604: Rebuild patches
21 lines
906 B
Diff
21 lines
906 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 d087645dd83b4c4748cfe0dc151e31e195affdfe..b4c00b280438e59b604905e2cc329b1818c13a56 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -185,7 +185,7 @@ public class Main {
|
|
}
|
|
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
|
|
}
|
|
|
|
try {
|