From 00b945f6e30eb75441db58f95f613e94abcd8f03 Mon Sep 17 00:00:00 2001
From: yuhuihuang <i@huangyuhui.net>
Date: Sat, 1 Aug 2020 15:08:12 +0800
Subject: [PATCH] fix: #746

---
 .../authlibinjector/AuthlibInjectorAccount.java     |  7 ++++---
 .../hmcl/auth/yggdrasil/YggdrasilAccount.java       | 13 ++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java
index 24cbf504d..14bc95f55 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccount.java
@@ -142,17 +142,18 @@ public class AuthlibInjectorAccount extends YggdrasilAccount {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof AuthlibInjectorAccount))
+        if (obj == null || obj.getClass() != AuthlibInjectorAccount.class)
             return false;
         AuthlibInjectorAccount another = (AuthlibInjectorAccount) obj;
-        return super.equals(another) && server.equals(another.server);
+        return characterUUID.equals(another.characterUUID) && server.equals(another.server);
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this)
+                .append("uuid", characterUUID)
                 .append("username", getUsername())
-                .append("server", getServer())
+                .append("server", getServer().getUrl())
                 .toString();
     }
 }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilAccount.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilAccount.java
index dbc13a937..e702868a1 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilAccount.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilAccount.java
@@ -35,9 +35,9 @@ import static java.util.Objects.requireNonNull;
 
 public class YggdrasilAccount extends Account {
 
-    private final YggdrasilService service;
-    private final UUID characterUUID;
-    private final String username;
+    protected final YggdrasilService service;
+    protected final UUID characterUUID;
+    protected final String username;
 
     private boolean authenticated = false;
     private YggdrasilSession session;
@@ -174,9 +174,8 @@ public class YggdrasilAccount extends Account {
         Map<Object, Object> storage = new HashMap<>();
         storage.put("username", username);
         storage.putAll(session.toStorage());
-        service.getProfileRepository().getImmediately(characterUUID).ifPresent(profile -> {
-            storage.put("profileProperties", profile.getProperties());
-        });
+        service.getProfileRepository().getImmediately(characterUUID).ifPresent(profile ->
+                storage.put("profileProperties", profile.getProperties()));
         return storage;
     }
 
@@ -210,7 +209,7 @@ public class YggdrasilAccount extends Account {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof YggdrasilAccount))
+        if (obj == null || obj.getClass() != YggdrasilAccount.class)
             return false;
         YggdrasilAccount another = (YggdrasilAccount) obj;
         return characterUUID.equals(another.characterUUID);