fix: allow offline player

Grasscutters · Aug 30, 2023 · a12b10d · a12b10d
1 parent 8d5bacd
commit a12b10d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/java/emu/grasscutter/game/friends/Friendship.java b/src/main/java/emu/grasscutter/game/friends/Friendship.java
@@ -95,7 +95,7 @@ public void delete() {
     }
 
     public FriendBrief toProto() {
-        this.getFriendProfile().getPlayer(); // check if player is online and sync player if online.
+        var player = this.getFriendProfile().getPlayer(); // get latest player and sync.
 
         return FriendBrief.newBuilder()
             .setUid(getFriendProfile().getUid())
@@ -106,7 +106,7 @@ public FriendBrief toProto() {
             .setWorldLevel(getFriendProfile().getWorldLevel())
             .setSignature(getFriendProfile().getSignature())
             .setOnlineState(
-                getFriendProfile().isOnline()
+                player != null && player.isOnline()
                     ? FriendOnlineState.FRIEND_ONLINE_STATE_ONLINE
                     : FriendOnlineState.FRIEND_ONLINE_STATE_DISCONNECT)
             .setIsMpModeAvailable(true)

diff --git a/src/main/java/emu/grasscutter/game/friends/PlayerProfile.java b/src/main/java/emu/grasscutter/game/friends/PlayerProfile.java
@@ -36,7 +36,7 @@ public PlayerProfile(Player player) {
 
     @Nullable
     public Player getPlayer() {
-        var player = Grasscutter.getGameServer().getPlayerByUid(this.getUid());
+        var player = Grasscutter.getGameServer().getPlayerByUid(this.getUid(), true);
         this.syncWithCharacter(player);
         return player;
     }
@@ -49,10 +49,6 @@ public int getDaysSinceLogin() {
         return (int) Math.floor((Utils.getCurrentSeconds() - getLastActiveTime()) / 86400.0);
     }
 
-    public boolean isOnline() {
-        return this.getPlayer() != null;
-    }
-
     public void syncWithCharacter(Player player) {
         if (player == null) {
             return;