more patches added back

2021-06-15 23:25:38 -07:00 · 2021-06-15 23:25:38 -07:00 · 852ce73590
commit 852ce73590
parent 98994a0aa1
381 changed files with 353 additions and 463 deletions
--- a/patches/server/0377-Allow-overriding-the-java-version-check.patch
+++ b/patches/server/0377-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 f68d44721c91c20a7e4abffe26dabff8b5d2c3ce..fd48cfe3dfaf7c867becfbf90246af2f33a74612 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 {