Merge #1357 into v5 (Get skin from profile properties by property name)

NEZNAMY · Aug 20, 2024 · f488f18 · f488f18
1 parent 6164dd8
commit f488f18
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/BungeeTabPlayer.java b/bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/BungeeTabPlayer.java
@@ -67,8 +67,13 @@ public TabList.Skin getSkin() {
         LoginResult loginResult = ((InitialHandler)getPlayer().getPendingConnection()).getLoginProfile();
         if (loginResult == null) return null;
         Property[] properties = loginResult.getProperties();
-        if (properties == null || properties.length == 0) return null; //Offline mode
-        return new TabList.Skin(properties[0].getValue(), properties[0].getSignature());
+        if (properties == null) return null; //Offline mode
+        for (Property property : properties) {
+            if (property.getName().equals(TabList.TEXTURES_PROPERTY)) {
+                return new TabList.Skin(property.getValue(), property.getSignature());
+            }
+        }
+        return null;
     }
 
     @Override

diff --git a/sponge8/src/main/java/me/neznamy/tab/platforms/sponge8/SpongeTabPlayer.java b/sponge8/src/main/java/me/neznamy/tab/platforms/sponge8/SpongeTabPlayer.java
@@ -68,7 +68,12 @@ public boolean isDisguised() {
     public TabList.Skin getSkin() {
         List<ProfileProperty> list = getPlayer().profile().properties();
         if (list.isEmpty()) return null; // Offline mode
-        return new TabList.Skin(list.get(0).value(), list.get(0).signature().orElse(null));
+        for (ProfileProperty property : list) {
+            if (property.name().equals(TabList.TEXTURES_PROPERTY)) {
+                return new TabList.Skin(property.value(), property.signature().orElse(null));
+            }
+        }
+        return null;
     }
 
     @Override

diff --git a/velocity/src/main/java/me/neznamy/tab/platforms/velocity/VelocityTabPlayer.java b/velocity/src/main/java/me/neznamy/tab/platforms/velocity/VelocityTabPlayer.java
@@ -48,7 +48,12 @@ public void sendMessage(@NotNull TabComponent message) {
     public TabList.Skin getSkin() {
         List<GameProfile.Property> properties = getPlayer().getGameProfile().getProperties();
         if (properties.isEmpty()) return null; //Offline mode
-        return new TabList.Skin(properties.get(0).getValue(), properties.get(0).getSignature());
+        for (GameProfile.Property property : properties) {
+            if (property.getName().equals(TabList.TEXTURES_PROPERTY)) {
+                return new TabList.Skin(property.getValue(), property.getSignature());
+            }
+        }
+        return null;
     }
 
     @Override