From 5bbbb6fffc20824bf763b735dc08368fc56abce3 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 16 Mar 2022 14:10:32 +0100 Subject: [PATCH] Remove Java version check once and for all (#7612) Closes #7611 --- ... => Remove-garbage-Java-version-check.patch} | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) rename patches/server/{Allow-overriding-the-java-version-check.patch => Remove-garbage-Java-version-check.patch} (55%) diff --git a/patches/server/Allow-overriding-the-java-version-check.patch b/patches/server/Remove-garbage-Java-version-check.patch similarity index 55% rename from patches/server/Allow-overriding-the-java-version-check.patch rename to patches/server/Remove-garbage-Java-version-check.patch index 82c1dd7747..d0eb1c9fd1 100644 --- a/patches/server/Allow-overriding-the-java-version-check.patch +++ b/patches/server/Remove-garbage-Java-version-check.patch @@ -1,20 +1,21 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zach Brown <1254957+zachbr@users.noreply.github.com> -Date: Sat, 8 Feb 2020 18:02:24 -0600 -Subject: [PATCH] Allow overriding the java version check +From: Nassim Jahnke +Date: Wed, 16 Mar 2022 13:58:16 +0100 +Subject: [PATCH] Remove garbage 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -0,0 +0,0 @@ public class Main { + 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 > 61.0) { - System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 17 is supported."); +- 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 { + // Paper start - Handled by TerminalConsoleAppender