Merge remote-tracking branch 'remotes/origin/feature/playerlist-updat…

…es-1.16' into t/bleeding # Conflicts: # connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
bundabrg · Jun 30, 2020 · f153b95 · f153b95
2 parents 0f32251 + 6aaaee3
commit f153b95
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/connector/src/main/java/org/geysermc/connector/entity/PlayerEntity.java b/connector/src/main/java/org/geysermc/connector/entity/PlayerEntity.java
@@ -56,6 +56,7 @@ public class PlayerEntity extends LivingEntity {
     private GameProfile profile;
     private UUID uuid;
     private String username;
+    private String displayName;
     private long lastSkinUpdate = -1;
     private boolean playerList = true;
     private final EntityEffectCache effectCache;
@@ -293,4 +294,12 @@ public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession s
             }
         }
     }
+
+    /**
+     * Returns the DisplayName if set, otherwise the Username
+     * @return Name of player entity
+     */
+    public String getName() {
+        return displayName == null ? username : displayName;
+    }
 }
diff --git a/...sermc/connector/network/translators/java/entity/player/JavaPlayerListEntryTranslator.java b/...sermc/connector/network/translators/java/entity/player/JavaPlayerListEntryTranslator.java
@@ -30,6 +30,7 @@
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.connector.utils.MessageUtils;
 import org.geysermc.connector.utils.SkinUtils;
 
 import com.github.steveice10.mc.protocol.data.game.PlayerListEntry;
@@ -81,8 +82,9 @@ public void translate(ServerPlayerListEntryPacket packet, GeyserSession session)
                     playerEntity.setProfile(entry.getProfile());
                     playerEntity.setPlayerList(true);
                     playerEntity.setValid(true);
+                    playerEntity.setDisplayName(entry.getDisplayName() != null ? MessageUtils.getBedrockMessage(entry.getDisplayName()) : null);
 
-                    PlayerListPacket.Entry playerListEntry = SkinUtils.buildCachedEntry(entry.getProfile(), playerEntity.getGeyserId());
+                    PlayerListPacket.Entry playerListEntry = SkinUtils.buildCachedEntry(playerEntity);
                     if (self) {
                         // Copy the entry with our identity instead.
                         PlayerListPacket.Entry copy = new PlayerListPacket.Entry(session.getAuthData().getUUID());

diff --git a/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java b/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
@@ -58,18 +58,18 @@ public Register shim(Shim shim) {
         }
     }
 
-    public static PlayerListPacket.Entry buildCachedEntry(GameProfile profile, long geyserId) {
-        GameProfileData data = GameProfileData.from(profile);
+    public static PlayerListPacket.Entry buildCachedEntry(PlayerEntity playerEntity) {
+        GameProfileData data = GameProfileData.from(playerEntity.getProfile());
         SkinProvider.Cape cape = SkinProvider.getCachedCape(data.getCapeUrl());
 
         SkinProvider.SkinGeometry geometry = SkinProvider.SkinGeometry.getLegacy(data.isAlex());
 
         return buildEntryManually(
-                profile.getId(),
-                profile.getName(),
-                geyserId,
-                profile.getIdAsString(),
-                SkinProvider.getCachedSkin(profile.getId()).getSkinData(),
+                playerEntity.getProfile().getId(),
+                playerEntity.getName(),
+                playerEntity.getGeyserId(),
+                playerEntity.getProfile().getIdAsString(),
+                SkinProvider.getCachedSkin(playerEntity.getProfile().getId()).getSkinData(),
                 cape.getCapeId(),
                 cape.getCapeData(),
                 geometry.getGeometryName(),
@@ -218,7 +218,7 @@ public static void requestAndHandleSkinAndCape(PlayerEntity entity, GeyserSessio
                                 if (session.getUpstream().isInitialized()) {
                                     PlayerListPacket.Entry updatedEntry = buildEntryManually(
                                             entity.getUuid(),
-                                            entity.getUsername(),
+                                            entity.getName(),
                                             entity.getGeyserId(),
                                             entity.getUuid().toString(),
                                             skin.getSkinData(),