From 4d812cc49a0611189e4202d15e98ae0d57622251 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 25 Jun 2021 06:32:54 +0700 Subject: [PATCH] Revert b7b2c4868c4701255ed306ef8d8e33b18bf5272d --- .../src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java index 504155ce4..e3cb74a43 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java @@ -69,8 +69,6 @@ public class JREUtils } public static void initJavaRuntime() { dlopen(findInLdLibPath("libjli.so")); - File serverFile = new File(Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/server/libjvm.so"); - dlopen(Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/" + (serverFile.exists() ? "server" : "client") + "/libjvm.so"); dlopen(findInLdLibPath("libjvm.so")); dlopen(findInLdLibPath("libverify.so")); dlopen(findInLdLibPath("libjava.so")); @@ -188,8 +186,8 @@ public class JREUtils StringBuilder ldLibraryPath = new StringBuilder(); File serverFile = new File(Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/server/libjvm.so"); // To make libjli.so ignore re-execute - /*ldLibraryPath.append( - Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/" + (serverFile.exists() ? "server" : "client") + ":");*/ + ldLibraryPath.append( + Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/" + (serverFile.exists() ? "server" : "client") + ":"); ldLibraryPath.append( Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/jli:" + Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + ":"