Fixed problem when isRemoveNametags is true

Improved performance caching reflection fields

src/main/java/net/william278/velocitab/packet/ScoreboardManager.java

@@ -152,7 +152,7 @@ public class ScoreboardManager {
             return;
         }
         final Set<RegisteredServer> siblings = tabPlayer.getGroup().registeredServers(plugin);
-        final boolean isNameTagEmpty = tabPlayer.getGroup().nametag().isEmpty();
+        final boolean isNameTagEmpty = tabPlayer.getGroup().nametag().isEmpty() && !plugin.getSettings().isRemoveNametags();
 
         final Optional<Nametag> cachedTag = Optional.ofNullable(nametags.getOrDefault(teamName, null));
         cachedTag.ifPresent(nametag -> siblings.forEach(server -> server.getPlayersConnected().stream().filter(p -> p != player)
@@ -304,7 +304,7 @@ public class ScoreboardManager {
 
         final UpdateTeamsPacket packet = UpdateTeamsPacket.create(plugin, tabPlayer, teamName, nametag, viewer, teamMembers);
         trackedTeams.put(viewer.getPlayer().getUniqueId(), teamName);
-        final boolean isNameTagEmpty = tabPlayer.getGroup().nametag().isEmpty();
+        final boolean isNameTagEmpty = tabPlayer.getGroup().nametag().isEmpty() && !plugin.getSettings().isRemoveNametags();
         sendPacket(viewer.getPlayer(), packet, isNameTagEmpty);
     }
 
@@ -314,7 +314,7 @@ public class ScoreboardManager {
         if (!teams) {
             return;
         }
-        final boolean isNameTagEmpty = tabPlayer.getGroup().nametag().isEmpty();
+        final boolean isNameTagEmpty = tabPlayer.getGroup().nametag().isEmpty() && !plugin.getSettings().isRemoveNametags();
         tabPlayer.getGroup().getTabPlayers(plugin, tabPlayer).forEach(viewer -> {
             if (viewer == tabPlayer || !viewer.getPlayer().isActive()) {
                 return;
@@ -373,7 +373,7 @@ public class ScoreboardManager {
         }
 
         final Set<Player> players = tabPlayer.getGroup().getPlayers(plugin);
-        final boolean isNameTagEmpty = tabPlayer.getGroup().nametag().isEmpty();
+        final boolean isNameTagEmpty = tabPlayer.getGroup().nametag().isEmpty() && !plugin.getSettings().isRemoveNametags();
         players.forEach(connected -> {
             try {
                 final boolean canSee = plugin.getVanishManager().canSee(connected.getUsername(), player.getUsername());
@@ -459,7 +459,7 @@ public class ScoreboardManager {
         }
 
         final UpdateTeamsPacket removeTeam = UpdateTeamsPacket.removeTeam(plugin, team);
-        final boolean isNameTagEmpty = tabPlayer.getGroup().nametag().isEmpty();
+        final boolean isNameTagEmpty = tabPlayer.getGroup().nametag().isEmpty() && !plugin.getSettings().isRemoveNametags();
         sendPacket(player, removeTeam, isNameTagEmpty);
         trackedTeams.remove(player.getUniqueId(), team);
 

src/main/java/net/william278/velocitab/tab/PlayerTabList.java

@@ -28,6 +28,8 @@ import com.velocitypowered.api.proxy.player.TabListEntry;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
 import com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfoPacket;
+import com.velocitypowered.proxy.tablist.KeyedVelocityTabList;
+import com.velocitypowered.proxy.tablist.VelocityTabList;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.kyori.adventure.text.Component;
@@ -62,15 +64,38 @@ public class PlayerTabList {
     @Getter(value = AccessLevel.PUBLIC)
     private final Map<UUID, TabPlayer> players;
     private final TaskManager taskManager;
+    private final Map<Class<?>, Field> entriesFields;
 
     public PlayerTabList(@NotNull Velocitab plugin) {
         this.plugin = plugin;
         this.vanishTabList = new VanishTabList(plugin, this);
         this.players = Maps.newConcurrentMap();
         this.taskManager = new TaskManager(plugin);
+        this.entriesFields = Maps.newHashMap();
         this.reloadUpdate();
         this.registerListener();
         this.ensureDisplayNameTask();
+        this.registerFields();
+    }
+
+    // VelocityTabListLegacy is not supported
+    private void registerFields() {
+        final Class<KeyedVelocityTabList> keyedVelocityTabListClass = KeyedVelocityTabList.class;
+        final Class<VelocityTabList> velocityTabListClass = VelocityTabList.class;
+        try {
+            final Field entriesField = keyedVelocityTabListClass.getDeclaredField("entries");
+            entriesField.setAccessible(true);
+            this.entriesFields.put(keyedVelocityTabListClass, entriesField);
+        } catch (NoSuchFieldException e) {
+            plugin.log(Level.ERROR, "Failed to register KeyedVelocityTabList field", e);
+        }
+        try {
+            final Field entriesField = velocityTabListClass.getDeclaredField("entries");
+            entriesField.setAccessible(true);
+            this.entriesFields.put(velocityTabListClass, entriesField);
+        } catch (NoSuchFieldException e) {
+            plugin.log(Level.ERROR, "Failed to register VelocityTabList field", e);
+        }
     }
 
     private void registerListener() {
@@ -275,8 +300,11 @@ public class PlayerTabList {
     @SuppressWarnings("unchecked")
     private void fixDuplicateEntries(@NotNull Player target) {
         try {
-            final Field entriesField = target.getTabList().getClass().getDeclaredField("entries");
+            final Optional<Field> optionalField = Optional.ofNullable(this.entriesFields.get(target.getTabList().getClass()));
-            entriesField.setAccessible(true);
+            if (optionalField.isEmpty()) {
+                return;
+            }
+            final Field entriesField = optionalField.get();
             final Map<UUID, TabListEntry> entries = (Map<UUID, TabListEntry>) entriesField.get(target.getTabList());
             entries.entrySet().stream()
                     .filter(entry -> entry.getValue().getProfile() != null)