Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix javaPath not looking for .exe (#7590)

Browse Source 
I never tested this on windows and finally decided to get to the bottom of all the weird reports ive been getting
This commit is contained in:
buthed010203
2022-09-17 22:37:00 -04:00
committed by GitHub
parent 5117a5bd71
commit d66a3b80ae
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/Vars.java
View File

@@ -316,7 +316,8 @@ public class Vars implements Loadable{
logicVars = new GlobalVars(); logicVars = new GlobalVars();
javaPath = 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() :
Core.files.local("jre/bin/java").exists() ? Core.files.local("jre/bin/java").absolutePath() : 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"; "java";
state = new GameState(); state = new GameState();