SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show exception when headless JRE detection is triggered (#8559)

Browse Source
This commit is contained in:
Noah van der Aa
2022-11-12 13:09:54 +01:00
parent 36d8f327e8
commit da071ba78f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/server/Detect-headless-JREs.patch
View File

@@ -16,14 +16,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return RUNNING_AS_ROOT_OR_ADMIN; return RUNNING_AS_ROOT_OR_ADMIN;
} }
+ +
+ public static boolean isMissingAWTDependency() { + public static String awtDependencyCheck() {
+ try { + try {
+ new java.awt.Color(0); + new java.awt.Color(0);
+ } catch (UnsatisfiedLinkError e) { + } catch (UnsatisfiedLinkError e) {
+ return true; + return e.getClass().getName() + ": " + e.getMessage();
+ } + }
+ +
+ return false; + return null;
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
@@ -35,10 +35,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
+ // Paper start - Warn on headless + // Paper start - Warn on headless
+ if (io.papermc.paper.util.ServerEnvironment.isMissingAWTDependency()) { + String awtException = io.papermc.paper.util.ServerEnvironment.awtDependencyCheck();
+ if (awtException != null) {
+ Main.LOGGER.error("You are using a headless JRE distribution."); + Main.LOGGER.error("You are using a headless JRE distribution.");
+ Main.LOGGER.error("This distribution is missing certain graphic libraries that the Minecraft server needs to function."); + Main.LOGGER.error("This distribution is missing certain graphic libraries that the Minecraft server needs to function.");
+ Main.LOGGER.error("For instructions on how to install the non-headless JRE, see https://docs.papermc.io/misc/java-install"); + Main.LOGGER.error("For instructions on how to install the non-headless JRE, see https://docs.papermc.io/misc/java-install");
+ Main.LOGGER.error("");
+ Main.LOGGER.error(awtException);
+ return; + return;
+ } + }
+ // Paper end + // Paper end