Fix: On windows, try to pull java exe from JAVA_HOME for autoupdating

mindustry-antigrief · Oct 26, 2024 · e71495b · e71495b
1 parent 9680522
commit e71495b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
@@ -323,7 +323,8 @@ public static void init(){
         bases = new BaseRegistry();
         logicVars = new GlobalVars();
         javaPath =
-            new Fi(OS.prop("java.home")).child("bin/java").exists() ? new Fi(OS.prop("java.home")).child("bin/java").absolutePath() :
+            new Fi(OS.prop("java.home")).child("bin/java").exists() ? new Fi(OS.prop("java.home")).child("bin/java").absolutePath() : // Unix
+            new Fi(OS.prop("java.home")).child("bin/java.exe").exists() ? new Fi(OS.prop("java.home")).child("bin/java.exe").absolutePath() : // Windows
             Core.files.local("jre/bin/java").exists() ? Core.files.local("jre/bin/java").absolutePath() : // Unix
             Core.files.local("jre/bin/java.exe").exists() ? Core.files.local("jre/bin/java.exe").absolutePath() : // Windows
             "java"; // Fallback