From 33b00e417caffa395a7d153a2e4f4b43e4d32ee6 Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <khanhduytran0@users.noreply.github.com>
Date: Sun, 26 Dec 2021 05:43:14 +0700
Subject: [PATCH] =?UTF-8?q?Fix=20a=20NullPointerException=20when=20launchi?=
 =?UTF-8?q?ng=20=E2=89=A4=201.6.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/net/kdt/pojavlaunch/PLaunchApp.java    | 12 +++++++-----
 JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java |  4 +++-
 .../net/kdt/pojavlaunch/value/MinecraftAccount.java  |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java
index a3293c21..4765b69a 100644
--- a/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java
+++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java
@@ -62,12 +62,14 @@ public class PLaunchApp {
             }
             System.out.println("Launching Minecraft " + mVersion.id);
             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;
+            if (mVersion.logging != null) {
+                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);
             }
-            System.setProperty("log4j.configurationFile", configPath);
             Tools.launchMinecraft(AccountJNI.CURRENT_ACCOUNT, mVersion);
         } catch (Throwable th) {
             Tools.showError(th);
diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java
index cfedfddc..3ede47ea 100644
--- a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java
+++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java
@@ -187,8 +187,10 @@ public final class Tools
         varArgMap.put("auth_access_token", profile.accessToken);
         varArgMap.put("auth_player_name", username);
         varArgMap.put("auth_uuid", profile.profileId);
+        // varArgMap.put("auth_xuid", profile.profileId); // TODO!!!
         varArgMap.put("assets_root", Tools.ASSETS_PATH);
         varArgMap.put("assets_index_name", versionInfo.assets);
+        varArgMap.put("clientid", profile.clientToken);
         varArgMap.put("game_assets", Tools.ASSETS_PATH);
         varArgMap.put("game_directory", gameDir.getAbsolutePath());
         varArgMap.put("user_properties", "{}");
@@ -476,7 +478,7 @@ public final class Tools
                             DependentLibrary libAdded = libList.get(i);
                             String libAddedName = libAdded.name.substring(0, libAdded.name.lastIndexOf(":"));
                             
-                            if (libAddedName.equals(libName)) {
+                            if (!libAdded.name.equals(lib.name) && libAddedName.equals(libName)) {
                                 System.out.println("Library " + libName + ": Replaced version " +
                                     libAdded.name.substring(libAddedName.length() + 1) + " with " +
                                     lib.name.substring(libName.length() + 1));
diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java
index 0bd14439..81f8c346 100644
--- a/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java
+++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java
@@ -7,7 +7,7 @@ public class MinecraftAccount
 {
     public String accessToken = "0"; // access token
     public String clientToken = "0"; // clientID: refresh and invalidate
-    public String profileId = "0"; // authenticate UUID
+    public String profileId = "00000000-0000-0000-0000-000000000000"; // authenticate UUID
     public String username = "Steve";
     public String selectedVersion = "1.7.10";
     public boolean isMicrosoft = false;