squash patches

1 files changed, 47 insertions, 0 deletions

diff --git a/patches/server/0320-Improve-java-version-check.patch b/patches/server/0320-Improve-java-version-check.patch
new file mode 100644
index 0000000000..e5761ec018
--- /dev/null
+++ b/patches/server/0320-Improve-java-version-check.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <[email protected]>
+Date: Wed, 16 Mar 2022 13:58:16 +0100
+Subject: [PATCH] Improve java version check
+
+Co-Authored-By: MiniDigger <[email protected]>
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index caa7fefab037a24713e9f7f15a541d47bc7655ee..11b1e23ea2a0d4faf7e74d3c9580b7a776ac795b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -202,23 +202,27 @@ public class Main {
+                 return;
+             }
+ 
++            // Paper start - Improve java version check
++            boolean skip = Boolean.getBoolean("Paper.IgnoreJavaVersion");
+             float javaVersion = Float.parseFloat(System.getProperty("java.class.version"));
+-            if (javaVersion < 61.0) {
+-                System.err.println("Unsupported Java detected (" + javaVersion + "). This version of Minecraft requires at least Java 17. Check your Java version with the command 'java -version'.");
+-                return;
+-            }
+-            if (javaVersion > 66.0) {
+-                System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 22 is supported.");
++            boolean isOldVersion = javaVersion < 61.0;
++            if (!skip && isOldVersion) {
++                System.err.println("Unsupported Java detected (" + javaVersion + "). This version of Minecraft requires at least Java 21. Check your Java version with the command 'java -version'. For more info see https://docs.papermc.io/misc/java-install");
+                 return;
+             }
+             String javaVersionName = System.getProperty("java.version");
+             // J2SE SDK/JRE Version String Naming Convention
+             boolean isPreRelease = javaVersionName.contains("-");
+-            if (isPreRelease && javaVersion == 61.0) {
+-                System.err.println("Unsupported Java detected (" + javaVersionName + "). You are running an outdated, pre-release version. Only general availability versions of Java are supported. Please update your Java version.");
++            if (!skip && isPreRelease) {
++                System.err.println("Unsupported Java detected (" + javaVersionName + "). You are running an unsupported, non official, version. Only general availability versions of Java are supported. Please update your Java version. See https://docs.papermc.io/paper/faq#unsupported-java-detected-what-do-i-do for more information.");
+                 return;
+             }
+ 
++            if (skip && (isOldVersion || isPreRelease)) {
++                System.err.println("Unsupported Java detected ("+ javaVersionName + "), but the check was skipped. Proceed with caution! ");
++            }
++            // Paper end - Improve java version check
++
+             try {
+                 // Paper start - Handled by TerminalConsoleAppender
+                 /*