Cleanup

Signed-off-by: BT (calcastor/mame) <43831917+calcastor@users.noreply.github.com>

Author: calcastor

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/ModernPlayerUtils.java

@@ -13,7 +13,6 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,12 +61,9 @@ public void setFakeNameAndSkin(
     if (!oldName.equals(newName)) {
       Team team = viewer.getScoreboard().getEntryTeam(player.getName());
       if (team != null) {
-        // Add both names silently so the correct one is guaranteed present regardless of client
-        // state, then remove the stale one. sendPacketSilently bypasses handleScoreboardTeam.
-        sendTeamPacketSilently(
-            viewer, team.getName(), TeamMode.ADD_ENTITIES, List.of(oldName, newName));
-        sendTeamPacketSilently(
-            viewer, team.getName(), TeamMode.REMOVE_ENTITIES, Collections.singletonList(oldName));
+        // Skip handler in PacketManipulations
+        sendTeamPacketSilently(viewer, team.getName(), TeamMode.REMOVE_ENTITIES, List.of(oldName));
+        sendTeamPacketSilently(viewer, team.getName(), TeamMode.ADD_ENTITIES, List.of(newName));
       }
     }
   }

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/PacketManipulations.java

@@ -29,16 +29,23 @@ public PacketManipulations() {
             PacketType.Play.Server.PLAYER_INFO_UPDATE,
             this::handlePlayerInfo,
             PacketType.Play.Server.TEAMS,
-            this::handleScoreboardTeam));
+            this::handleScoreboardTeams));
   }
 
   private void handlePlayerInfo(@NonNull PacketSendEvent event) {
     Player viewer = event.getPlayer();
-    WrapperPlayServerPlayerInfoUpdate wrapper = new WrapperPlayServerPlayerInfoUpdate(event);
+    var wrapper = new WrapperPlayServerPlayerInfoUpdate(event);
+
+    var actions = wrapper.getActions();
+    boolean hasAddPlayer = actions.contains(WrapperPlayServerPlayerInfoUpdate.Action.ADD_PLAYER);
+    boolean hasUpdateDisplayName =
+        actions.contains(WrapperPlayServerPlayerInfoUpdate.Action.UPDATE_DISPLAY_NAME);
+
+    if (!hasAddPlayer && !hasUpdateDisplayName) return;
 
     boolean modified = false;
-    List<WrapperPlayServerPlayerInfoUpdate.PlayerInfo> entries = wrapper.getEntries();
-    for (WrapperPlayServerPlayerInfoUpdate.PlayerInfo entry : entries) {
+    var entries = wrapper.getEntries();
+    for (var entry : entries) {
       Player player = Bukkit.getPlayer(entry.getProfileId());
       if (player == null || player.equals(viewer)) continue;
 
@@ -47,42 +54,47 @@ private void handlePlayerInfo(@NonNull PacketSendEvent event) {
 
       if (StringUtils.isBlank(playerName) || StringUtils.isBlank(playerDisplayName)) continue;
 
-      UserProfile profile = entry.getGameProfile();
-      profile.setName(playerName);
+      if (hasAddPlayer) {
+        UserProfile profile = entry.getGameProfile();
+        profile.setName(playerName);
+
+        Skin skin = PLAYER_UTILS.getPlayerSkin(player, viewer);
+        profile.getTextureProperties().clear();
+        profile
+            .getTextureProperties()
+            .add(new TextureProperty("textures", skin.getData(), skin.getSignature()));
 
-      Skin skin = PLAYER_UTILS.getPlayerSkin(player, viewer);
-      profile.getTextureProperties().clear();
-      profile
-          .getTextureProperties()
-          .add(new TextureProperty("textures", skin.getData(), skin.getSignature()));
+        entry.setGameProfile(profile);
+      }
 
-      entry.setGameProfile(profile);
-      entry.setDisplayName(
-          LegacyComponentSerializer.legacySection().deserialize(playerDisplayName));
+      if (hasUpdateDisplayName) {
+        entry.setDisplayName(
+            LegacyComponentSerializer.legacySection().deserialize(playerDisplayName));
+      }
 
       modified = true;
     }
 
     if (modified) event.markForReEncode(true);
   }
 
-  private void handleScoreboardTeam(@NonNull PacketSendEvent event) {
+  private void handleScoreboardTeams(@NonNull PacketSendEvent event) {
     Player viewer = event.getPlayer();
-    WrapperPlayServerTeams wrapper = new WrapperPlayServerTeams(event);
+    var wrapper = new WrapperPlayServerTeams(event);
 
     List<String> players = new ArrayList<>(wrapper.getPlayers());
     if (players.isEmpty()) return;
 
     boolean modified = false;
-    for (String name : players) {
-      Player player = Bukkit.getPlayerExact(name);
+    for (int i = 0; i < players.size(); i++) {
+      Player player = Bukkit.getPlayerExact(players.get(i));
 
       if (player == null || player.equals(viewer)) continue;
 
       String playerName = PLAYER_UTILS.getPlayerName(player, viewer);
-      if (StringUtils.isBlank(playerName) || playerName.equals(name)) continue;
+      if (StringUtils.isBlank(playerName) || playerName.equals(player.getName())) continue;
 
-      players.set(players.indexOf(name), playerName);
+      players.set(i, playerName);
       modified = true;
     }