PojavLauncherTeam/PojavLauncher_iOS
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:PojavLauncherTeam/PojavLauncher_iOS

Browse Source
This commit is contained in:
Adam Tunnic committed 2021-12-15 19:13:42 -05:00
2 parents 0b643476f4 12fb81f3ce
commit 2e30a1470f
2 files changed
+29 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java
+8 -2
View File
@@ -44,6 +44,13 @@ public class PLaunchApp {
public static void launchMinecraft() {
System.out.println("Launching Minecraft " + mVersion.id);
try {
String configPath;
if (mVersion.logging.client.file.id.equals("client-1.12.xml")) {
configPath = Tools.DIR_BUNDLE + "/log4j-rce-patch-1.12.xml";
} else {
configPath = Tools.DIR_GAME_NEW + "/" + mVersion.logging.client.file.id;
}
System.setProperty("log4j.configurationFile", configPath);
Tools.launchMinecraft(AccountJNI.CURRENT_ACCOUNT, mVersion);
} catch (Throwable th) {
Tools.showError(th);
@@ -116,11 +123,10 @@ public class PLaunchApp {
e.printStackTrace();
}
if (mVersion.logging != null) {
if (mVersion.logging != null && !mVersion.logging.client.file.id.equals("client-1.12.xml")) {
UIKit.updateProgressSafe(0, "Downloading " + mVersion.logging.client.file.id);
String configPath = Tools.DIR_GAME_NEW + "/" + mVersion.logging.client.file.id;
Tools.downloadFile(mVersion.logging.client.file.url, configPath);
System.setProperty("log4j.configurationFile", configPath);
}
maxProgress = mVersion.libraries.length + 1 + (assets == null ? 0 : assets.objects.size());