Updated Upstream (Bukkit/CraftBukkit/Spigot)

2021-12-31 19:05:42 -08:00 · 2021-12-31 19:05:42 -08:00 · 3a43821c38
commit 3a43821c38
parent 8b1734123e
859 changed files with 561 additions and 656 deletions
--- a/patches/server/0369-Allow-overriding-the-java-version-check.patch
+++ b/patches/server/0369-Allow-overriding-the-java-version-check.patch
@ -0,0 +1,20 @@
+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 a87a6583a1bd31a276a79c2cfb3c3ca4e749c3dc..e3b2b61e5f030080e481dc00d1086f723b8b97ee 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -191,7 +191,7 @@ public class Main {
+             }
+             if (javaVersion > 61.0) {
+                 System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 17 is supported.");
+-                return;
+                if (!Boolean.getBoolean("Paper.IgnoreJavaVersion")) return; // Paper
+             }
+ 
+             try {