Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
b31089a929
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: d264e972 #591: Add option for a consumer before spawning an item 1c537fce #590: Add spawn and transform reasons for piglin zombification. CraftBukkit Changes: ee5006d1 #810: Add option for a consumer before spawning an item f6a39d3c #809: Add spawn and transform reasons for piglin zombification. 0c24068a Organise imports Spigot Changes: bff52619 Organise imports
81 Zeilen
3.8 KiB
Diff
81 Zeilen
3.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Kyle Wood <demonwav@gmail.com>
|
|
Date: Wed, 2 Dec 2020 21:58:45 -0800
|
|
Subject: [PATCH] Add warning for servers not running on Java 11
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/util/PaperJvmChecker.java b/src/main/java/io/papermc/paper/util/PaperJvmChecker.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..c6ea429819c07e7f4bc257cad73463a030767825
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/util/PaperJvmChecker.java
|
|
@@ -0,0 +1,48 @@
|
|
+package io.papermc.paper.util;
|
|
+
|
|
+import org.apache.logging.log4j.LogManager;
|
|
+import org.apache.logging.log4j.Logger;
|
|
+
|
|
+import java.util.regex.Matcher;
|
|
+import java.util.regex.Pattern;
|
|
+
|
|
+public class PaperJvmChecker {
|
|
+
|
|
+ private static int getJvmVersion() {
|
|
+ String javaVersion = System.getProperty("java.version");
|
|
+ final Matcher matcher = Pattern.compile("(?:1\\.)?(\\d+)").matcher(javaVersion);
|
|
+ if (!matcher.find()) {
|
|
+ LogManager.getLogger().warn("Failed to determine Java version; Could not parse: {}", javaVersion);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ final String version = matcher.group(1);
|
|
+ try {
|
|
+ return Integer.parseInt(version);
|
|
+ } catch (final NumberFormatException e) {
|
|
+ LogManager.getLogger().warn("Failed to determine Java version; Could not parse {} from {}", version, javaVersion, e);
|
|
+ return -1;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ public static void checkJvm() {
|
|
+ if (getJvmVersion() < 11) {
|
|
+ final Logger logger = LogManager.getLogger();
|
|
+ logger.warn("************************************************************");
|
|
+ logger.warn("* WARNING - YOU ARE RUNNING AN OUTDATED VERSION OF JAVA.");
|
|
+ logger.warn("* PAPER WILL STOP BEING COMPATIBLE WITH THIS VERSION OF");
|
|
+ logger.warn("* JAVA WHEN MINECRAFT 1.17 IS RELEASED.");
|
|
+ logger.warn("*");
|
|
+ logger.warn("* Please update the version of Java you use to run Paper");
|
|
+ logger.warn("* to at least Java 11. When Paper for Minecraft 1.17 is");
|
|
+ logger.warn("* released support for versions of Java before 11 will");
|
|
+ logger.warn("* be dropped.");
|
|
+ logger.warn("*");
|
|
+ logger.warn("* Current Java version: {}", System.getProperty("java.version"));
|
|
+ logger.warn("*");
|
|
+ logger.warn("* Check this forum post for more information: ");
|
|
+ logger.warn("* https://papermc.io/java11");
|
|
+ logger.warn("************************************************************");
|
|
+ }
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index 5a1c14eccf58c39aced52011c6e094c0a3c46cd9..c858e750018dcf5b1c19ee66d4173119b88101a1 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -72,6 +72,7 @@ import org.bukkit.event.server.ServerLoadEvent;
|
|
|
|
import co.aikar.timings.MinecraftTimings; // Paper
|
|
import org.spigotmc.SlackActivityAccountant; // Spigot
|
|
+import io.papermc.paper.util.PaperJvmChecker; // Paper
|
|
|
|
public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements IMojangStatistics, ICommandListener, AutoCloseable {
|
|
|
|
@@ -956,6 +957,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
|
|
// Paper end
|
|
|
|
+ PaperJvmChecker.checkJvm(); // Paper jvm version nag
|
|
org.spigotmc.WatchdogThread.tick(); // Paper
|
|
org.spigotmc.WatchdogThread.hasStarted = true; // Paper
|
|
Arrays.fill( recentTps, 20 );
|