From d5fa232704b8207557491ac89015714085dd8430 Mon Sep 17 00:00:00 2001 From: Glavo Date: Thu, 31 Jul 2025 20:17:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=BD=E7=95=A5=20%ProgramFiles%\Common=20Fi?= =?UTF-8?q?les\Oracle\Java=20=E4=B8=AD=E7=9A=84=20Java=20(#4142)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jackhuang/hmcl/java/JavaManager.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/java/JavaManager.java b/HMCL/src/main/java/org/jackhuang/hmcl/java/JavaManager.java index 3e2ccd0ac..787e5a995 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/java/JavaManager.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/java/JavaManager.java @@ -411,8 +411,15 @@ public final class JavaManager { if (System.getenv("PATH") != null) { String[] paths = System.getenv("PATH").split(File.pathSeparator); for (String path : paths) { + // https://github.com/HMCL-dev/HMCL/issues/4079 + // https://github.com/Meloong-Git/PCL/issues/4261 + if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS && path.toLowerCase(Locale.ROOT) + .contains("\\common files\\oracle\\java\\")) { + continue; + } + try { - tryAddJavaExecutable(javaRuntimes, Paths.get(path, OperatingSystem.CURRENT_OS.getJavaExecutable())); + tryAddJavaExecutable(javaRuntimes, Path.of(path, OperatingSystem.CURRENT_OS.getJavaExecutable())); } catch (InvalidPathException ignored) { } }