4.0.6

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 allprojects {
     group = "me.neznamy"
-    version = "4.0.5"
+    version = "4.0.6"
     description = "An all-in-one solution that works"
 
     ext.set("id", "tab")

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/BungeeBossBar.java

@@ -38,7 +38,7 @@ public class BungeeBossBar implements BossBar {
         packet.setTitle(IChatBaseComponent.optimizedComponent(title).toString(player.getVersion()));
         packet.setColor(color.ordinal());
         packet.setDivision(style.ordinal());
-        player.getPlayer().unsafe().sendPacket(packet);
+        player.sendPacket(packet);
 
         colors.put(id, color.ordinal());
         styles.put(id, style.ordinal());
@@ -50,7 +50,7 @@ public class BungeeBossBar implements BossBar {
 
         net.md_5.bungee.protocol.packet.BossBar packet = new net.md_5.bungee.protocol.packet.BossBar(id, 3);
         packet.setTitle(IChatBaseComponent.optimizedComponent(title).toString(player.getVersion()));
-        player.getPlayer().unsafe().sendPacket(packet);
+        player.sendPacket(packet);
     }
 
     @Override
@@ -59,7 +59,7 @@ public class BungeeBossBar implements BossBar {
 
         net.md_5.bungee.protocol.packet.BossBar packet = new net.md_5.bungee.protocol.packet.BossBar(id, 2);
         packet.setHealth(progress);
-        player.getPlayer().unsafe().sendPacket(packet);
+        player.sendPacket(packet);
     }
 
     @Override
@@ -69,7 +69,7 @@ public class BungeeBossBar implements BossBar {
         net.md_5.bungee.protocol.packet.BossBar packet = new net.md_5.bungee.protocol.packet.BossBar(id, 4);
         packet.setDivision(style.ordinal());
         packet.setColor(colors.get(id));
-        player.getPlayer().unsafe().sendPacket(packet);
+        player.sendPacket(packet);
 
         styles.put(id, style.ordinal());
     }
@@ -81,7 +81,7 @@ public class BungeeBossBar implements BossBar {
         net.md_5.bungee.protocol.packet.BossBar packet = new net.md_5.bungee.protocol.packet.BossBar(id, 4);
         packet.setDivision(styles.get(id));
         packet.setColor(color.ordinal());
-        player.getPlayer().unsafe().sendPacket(packet);
+        player.sendPacket(packet);
 
         colors.put(id, color.ordinal());
     }
@@ -90,7 +90,7 @@ public class BungeeBossBar implements BossBar {
     public void remove(@NotNull UUID id) {
         if (player.getVersion().getMinorVersion() < 9) return;
 
-        player.getPlayer().unsafe().sendPacket(new net.md_5.bungee.protocol.packet.BossBar(id, 1));
+        player.sendPacket(new net.md_5.bungee.protocol.packet.BossBar(id, 1));
 
         colors.remove(id);
         styles.remove(id);

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/BungeeEventListener.java

@@ -1,5 +1,6 @@
 package me.neznamy.tab.platforms.bungeecord;
 
+import me.neznamy.tab.shared.ProtocolVersion;
 import me.neznamy.tab.shared.TAB;
 import me.neznamy.tab.shared.TabConstants;
 import me.neznamy.tab.shared.platform.EventListener;
@@ -25,7 +26,13 @@ public class BungeeEventListener extends EventListener<ProxiedPlayer> implements
 
     @EventHandler
     public void onSwitch(ServerSwitchEvent e) {
-        serverChange(e.getPlayer(), e.getPlayer().getUniqueId(), e.getPlayer().getServer().getInfo().getName());
+        Runnable task = () -> serverChange(e.getPlayer(), e.getPlayer().getUniqueId(), e.getPlayer().getServer().getInfo().getName());
+        // Temporary workaround until https://github.com/SpigotMC/BungeeCord/issues/3542 is resolved
+        if (e.getPlayer().getPendingConnection().getVersion() >= ProtocolVersion.V1_20_2.getNetworkId()) {
+            TAB.getInstance().getCPUManager().runTaskLater(500, "", "", task);
+        } else {
+            task.run();
+        }
     }
 
     @EventHandler

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/BungeeScoreboard.java

@@ -33,12 +33,12 @@ public class BungeeScoreboard extends Scoreboard<BungeeTabPlayer> {
     @Override
     @SneakyThrows
     public void setDisplaySlot(@NotNull DisplaySlot slot, @NotNull String objective) {
-        player.getPlayer().unsafe().sendPacket(newScoreboardDisplay.newInstance((byte)slot.ordinal(), objective));
+        player.sendPacket(newScoreboardDisplay.newInstance((byte)slot.ordinal(), objective));
     }
 
     @Override
     public void registerObjective0(@NotNull String objectiveName, @NotNull String title, @NotNull HealthDisplay display) {
-        player.getPlayer().unsafe().sendPacket(new ScoreboardObjective(
+        player.sendPacket(new ScoreboardObjective(
                 objectiveName,
                 jsonOrRaw(title),
                 ScoreboardObjective.HealthDisplay.valueOf(display.name()),
@@ -48,7 +48,7 @@ public class BungeeScoreboard extends Scoreboard<BungeeTabPlayer> {
 
     @Override
     public void unregisterObjective0(@NotNull String objectiveName) {
-        player.getPlayer().unsafe().sendPacket(new ScoreboardObjective(
+        player.sendPacket(new ScoreboardObjective(
                 objectiveName,
                 "", // Empty string to prevent kick on 1.7
                 null,
@@ -58,7 +58,7 @@ public class BungeeScoreboard extends Scoreboard<BungeeTabPlayer> {
 
     @Override
     public void updateObjective0(@NotNull String objectiveName, @NotNull String title, @NotNull HealthDisplay display) {
-        player.getPlayer().unsafe().sendPacket(new ScoreboardObjective(
+        player.sendPacket(new ScoreboardObjective(
                 objectiveName,
                 jsonOrRaw(title),
                 ScoreboardObjective.HealthDisplay.valueOf(display.name()),
@@ -74,13 +74,13 @@ public class BungeeScoreboard extends Scoreboard<BungeeTabPlayer> {
         if (player.getVersion().getMinorVersion() >= 13) {
             color = EnumChatFormat.lastColorsOf(prefix).ordinal();
         }
-        player.getPlayer().unsafe().sendPacket(new Team(name, (byte) 0, jsonOrRaw(name), jsonOrRaw(prefix), jsonOrRaw(suffix),
+        player.sendPacket(new Team(name, (byte) 0, jsonOrRaw(name), jsonOrRaw(prefix), jsonOrRaw(suffix),
                 visibility.toString(), collision.toString(), color, (byte)options, players.toArray(new String[0])));
     }
 
     @Override
     public void unregisterTeam0(@NotNull String name) {
-        player.getPlayer().unsafe().sendPacket(new Team(name));
+        player.sendPacket(new Team(name));
     }
 
     @Override
@@ -90,18 +90,18 @@ public class BungeeScoreboard extends Scoreboard<BungeeTabPlayer> {
         if (player.getVersion().getMinorVersion() >= 13) {
             color = EnumChatFormat.lastColorsOf(prefix).ordinal();
         }
-        player.getPlayer().unsafe().sendPacket(new Team(name, (byte) 2, jsonOrRaw(name), jsonOrRaw(prefix),
+        player.sendPacket(new Team(name, (byte) 2, jsonOrRaw(name), jsonOrRaw(prefix),
                 jsonOrRaw(suffix), visibility.toString(), collision.toString(), color, (byte)options, null));
     }
 
     @Override
     public void setScore0(@NotNull String objective, @NotNull String playerName, int score) {
-        player.getPlayer().unsafe().sendPacket(new ScoreboardScore(playerName, (byte) 0, objective, score));
+        player.sendPacket(new ScoreboardScore(playerName, (byte) 0, objective, score));
     }
 
     @Override
     public void removeScore0(@NotNull String objective, @NotNull String playerName) {
-        player.getPlayer().unsafe().sendPacket(new ScoreboardScore(playerName, (byte) 1, objective, 0));
+        player.sendPacket(new ScoreboardScore(playerName, (byte) 1, objective, 0));
     }
 
     /**

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/BungeeTabPlayer.java

@@ -2,6 +2,7 @@ package me.neznamy.tab.platforms.bungeecord;
 
 import de.myzelyam.api.vanish.BungeeVanishAPI;
 import lombok.Getter;
+import lombok.SneakyThrows;
 import me.neznamy.tab.shared.ProtocolVersion;
 import me.neznamy.tab.platforms.bungeecord.tablist.BungeeTabList1193;
 import me.neznamy.tab.platforms.bungeecord.tablist.BungeeTabList17;
@@ -12,10 +13,13 @@ import me.neznamy.tab.shared.platform.Scoreboard;
 import me.neznamy.tab.shared.platform.TabList;
 import me.neznamy.tab.shared.platform.bossbar.BossBar;
 import me.neznamy.tab.shared.proxy.ProxyTabPlayer;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import net.md_5.bungee.UserConnection;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.connection.InitialHandler;
 import net.md_5.bungee.connection.LoginResult;
+import net.md_5.bungee.protocol.DefinedPacket;
 import net.md_5.bungee.protocol.Property;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -29,6 +33,9 @@ public class BungeeTabPlayer extends ProxyTabPlayer {
     /** Flag tracking plugin presence */
     private static final boolean premiumVanish = ProxyServer.getInstance().getPluginManager().getPlugin("PremiumVanish") != null;
 
+    /** Flag tracking version of bungeecord with packet queue due to configuration phase */
+    private static final boolean packetQueue = ReflectionUtils.methodExists(UserConnection.class, "sendPacketQueued", DefinedPacket.class);
+
     /** Player's scoreboard */
     @NotNull
     private final Scoreboard<BungeeTabPlayer> scoreboard = new BungeeScoreboard(this);
@@ -141,4 +148,20 @@ public class BungeeTabPlayer extends ProxyTabPlayer {
         if (version >= ProtocolVersion.V1_8.getNetworkId()) return tabList1_8;
         return tabList1_7;
     }
+
+    /**
+     * Sends packet to the player. If BungeeCord supports 1.20.2+, new packet queue method is used
+     * to avoid error when sending packet in configuration phase.
+     *
+     * @param   packet
+     *          Packet to send
+     */
+    @SneakyThrows
+    public void sendPacket(@NotNull DefinedPacket packet) {
+        if (packetQueue) {
+            UserConnection.class.getDeclaredMethod("sendPacketQueued", DefinedPacket.class).invoke(player, packet);
+        } else {
+            getPlayer().unsafe().sendPacket(packet);
+        }
+    }
 }

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/tablist/BungeeTabList.java

@@ -0,0 +1,71 @@
+package me.neznamy.tab.platforms.bungeecord.tablist;
+
+import lombok.SneakyThrows;
+import me.neznamy.tab.platforms.bungeecord.BungeeTabPlayer;
+import me.neznamy.tab.shared.chat.IChatBaseComponent;
+import me.neznamy.tab.shared.platform.TabList;
+import me.neznamy.tab.shared.util.ReflectionUtils;
+import net.md_5.bungee.UserConnection;
+import net.md_5.bungee.protocol.Property;
+import net.md_5.bungee.protocol.packet.PlayerListItem.Item;
+import net.md_5.bungee.tab.ServerUnique;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.UUID;
+
+public abstract class BungeeTabList implements TabList {
+
+    /** Player this TabList belongs to */
+    @NotNull
+    protected final BungeeTabPlayer player;
+
+    /** Pointer to UUIDs in player's TabList */
+    private final Collection<UUID> uuids;
+
+    @SneakyThrows
+    @SuppressWarnings("unchecked")
+    public BungeeTabList(@NotNull BungeeTabPlayer player) {
+        this.player = player;
+        uuids = (Collection<UUID>) ReflectionUtils.getField(ServerUnique.class, "uuids").get(((UserConnection)player.getPlayer()).getTabListHandler());
+    }
+
+    @Override
+    public void setPlayerListHeaderFooter(@NotNull IChatBaseComponent header, @NotNull IChatBaseComponent footer) {
+        player.getPlayer().setTabHeader(
+                player.getPlatform().toComponent(header, player.getVersion()),
+                player.getPlatform().toComponent(footer, player.getVersion())
+        );
+    }
+
+    @NotNull
+    public Item item(@NotNull UUID id) {
+        Item item = new Item();
+        item.setUuid(id);
+        return item;
+    }
+
+    @NotNull
+    public Item entryToItem(Entry entry) {
+        Item item = item(entry.getUniqueId());
+        if (entry.getDisplayName() != null) item.setDisplayName(entry.getDisplayName().toString(player.getVersion()));
+        item.setGamemode(entry.getGameMode());
+        item.setListed(true);
+        item.setPing(entry.getLatency());
+        if (entry.getSkin() != null) {
+            item.setProperties(new Property[]{new Property(TEXTURES_PROPERTY, entry.getSkin().getValue(), entry.getSkin().getSignature())});
+        } else {
+            item.setProperties(new Property[0]);
+        }
+        item.setUsername(entry.getName());
+        return item;
+    }
+
+    public void addUuid(UUID id) {
+        uuids.add(id);
+    }
+
+    public void removeUuid(UUID id) {
+        uuids.remove(id);
+    }
+}

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/tablist/BungeeTabList1193.java

@@ -1,11 +1,7 @@
 package me.neznamy.tab.platforms.bungeecord.tablist;
 
-import lombok.RequiredArgsConstructor;
 import me.neznamy.tab.platforms.bungeecord.BungeeTabPlayer;
 import me.neznamy.tab.shared.chat.IChatBaseComponent;
-import me.neznamy.tab.shared.platform.TabList;
-import net.md_5.bungee.UserConnection;
-import net.md_5.bungee.protocol.Property;
 import net.md_5.bungee.protocol.packet.PlayerListItem.Item;
 import net.md_5.bungee.protocol.packet.PlayerListItemRemove;
 import net.md_5.bungee.protocol.packet.PlayerListItemUpdate;
@@ -18,21 +14,19 @@ import java.util.UUID;
 /**
  * TabList handler for 1.19.3+ players using the new tab list packets.
  * Because BungeeCord does not have a TabList API, we need to use packets.
- * They are sent using an internal BungeeCord method that keeps track of them,
- * so they are removed on server switch to secure parity with Velocity.
  */
-@RequiredArgsConstructor
-public class BungeeTabList1193 implements TabList {
+public class BungeeTabList1193 extends BungeeTabList {
 
-    /** Player this TabList belongs to */
-    @NotNull
-    private final BungeeTabPlayer player;
+    public BungeeTabList1193(@NotNull BungeeTabPlayer player) {
+        super(player);
+    }
 
     @Override
     public void removeEntry(@NotNull UUID entry) {
+        removeUuid(entry);
         PlayerListItemRemove remove = new PlayerListItemRemove();
         remove.setUuids(new UUID[]{entry});
-        ((UserConnection)player.getPlayer()).getTabListHandler().onUpdate(remove);
+        player.sendPacket(remove);
     }
 
     @Override
@@ -58,39 +52,14 @@ public class BungeeTabList1193 implements TabList {
 
     @Override
     public void addEntry(@NotNull Entry entry) {
-        Item item = item(entry.getUniqueId());
-        if (entry.getDisplayName() != null) item.setDisplayName(entry.getDisplayName().toString(player.getVersion()));
-        item.setGamemode(entry.getGameMode());
-        item.setListed(true);
-        item.setPing(entry.getLatency());
-        if (entry.getSkin() != null) {
-            item.setProperties(new Property[]{new Property(TEXTURES_PROPERTY, entry.getSkin().getValue(), entry.getSkin().getSignature())});
-        } else {
-            item.setProperties(new Property[0]);
-        }
-        item.setUsername(entry.getName());
-        sendPacket(EnumSet.allOf(PlayerListItemUpdate.Action.class), item);
-    }
-
-    @NotNull
-    public Item item(@NotNull UUID id) {
-        Item item = new Item();
-        item.setUuid(id);
-        return item;
+        addUuid(entry.getUniqueId());
+        sendPacket(EnumSet.allOf(PlayerListItemUpdate.Action.class), entryToItem(entry));
     }
 
     private void sendPacket(@NotNull EnumSet<PlayerListItemUpdate.Action> actions, @NotNull Item item) {
         PlayerListItemUpdate packet = new PlayerListItemUpdate();
         packet.setActions(actions);
         packet.setItems(new Item[]{item});
-        ((UserConnection)player.getPlayer()).getTabListHandler().onUpdate(packet);
-    }
-
-    @Override
-    public void setPlayerListHeaderFooter(@NotNull IChatBaseComponent header, @NotNull IChatBaseComponent footer) {
-        player.getPlayer().setTabHeader(
-                player.getPlatform().toComponent(header, player.getVersion()),
-                player.getPlatform().toComponent(footer, player.getVersion())
-        );
+        player.sendPacket(packet);
     }
 }

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/tablist/BungeeTabList17.java

@@ -1,10 +1,7 @@
 package me.neznamy.tab.platforms.bungeecord.tablist;
 
-import lombok.RequiredArgsConstructor;
 import me.neznamy.tab.platforms.bungeecord.BungeeTabPlayer;
 import me.neznamy.tab.shared.chat.IChatBaseComponent;
-import me.neznamy.tab.shared.platform.TabList;
-import net.md_5.bungee.UserConnection;
 import net.md_5.bungee.protocol.packet.PlayerListItem;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -19,17 +16,10 @@ import java.util.UUID;
  * names are changed by removing old entry and adding a new one, which
  * requires further tracking than just the UUID.<p>
  * Because BungeeCord does not have a TabList API, we need to use packets.
- * They are sent using an internal BungeeCord method that keeps track of them,
- * so they are removed on server switch to secure parity with Velocity.
  * While BungeeCord itself does not support 1.7, some of its forks do.
  * This was tested on FlameCord fork.
  */
-@RequiredArgsConstructor
-public class BungeeTabList17 implements TabList {
-
-    /** Player this TabList belongs to */
-    @NotNull
-    private final BungeeTabPlayer player;
+public class BungeeTabList17 extends BungeeTabList {
 
     /** Because entries are identified by names and not uuids on 1.7 */
     @NotNull
@@ -38,9 +28,14 @@ public class BungeeTabList17 implements TabList {
     @NotNull
     private final Map<UUID, String> displayNames = new HashMap<>();
 
+    public BungeeTabList17(@NotNull BungeeTabPlayer player) {
+        super(player);
+    }
+
     @Override
     public void removeEntry(@NotNull UUID entry) {
         if (!displayNames.containsKey(entry)) return; // Entry not tracked by TAB
+        removeUuid(entry);
         update(PlayerListItem.Action.REMOVE_PLAYER, createItem(null, displayNames.get(entry), 0));
 
         // Remove from map
@@ -66,6 +61,7 @@ public class BungeeTabList17 implements TabList {
 
     @Override
     public void addEntry(@NotNull Entry entry) {
+        addUuid(entry.getUniqueId());
         String displayNameString = entry.getDisplayName() == null ? String.valueOf(entry.getName()) : entry.getDisplayName().toLegacyText();
         if (displayNameString.length() > 16) displayNameString = displayNameString.substring(0, 16); // 16 character limit
         update(PlayerListItem.Action.ADD_PLAYER, createItem(entry.getName(), displayNameString, entry.getLatency()));
@@ -79,7 +75,7 @@ public class BungeeTabList17 implements TabList {
         PlayerListItem packet = new PlayerListItem();
         packet.setAction(action);
         packet.setItems(new PlayerListItem.Item[]{item});
-        ((UserConnection)player.getPlayer()).getTabListHandler().onUpdate(packet);
+        player.sendPacket(packet);
     }
 
     private PlayerListItem.Item createItem(@Nullable String username, @NotNull String displayName, int latency) {
@@ -89,9 +85,4 @@ public class BungeeTabList17 implements TabList {
         item.setPing(latency);
         return item;
     }
-
-    @Override
-    public void setPlayerListHeaderFooter(@NotNull IChatBaseComponent header, @NotNull IChatBaseComponent footer) {
-        // Added in 1.8
-    }
 }

bungeecord/src/main/java/me/neznamy/tab/platforms/bungeecord/tablist/BungeeTabList18.java

@@ -1,11 +1,7 @@
 package me.neznamy.tab.platforms.bungeecord.tablist;
 
-import lombok.RequiredArgsConstructor;
 import me.neznamy.tab.platforms.bungeecord.BungeeTabPlayer;
 import me.neznamy.tab.shared.chat.IChatBaseComponent;
-import me.neznamy.tab.shared.platform.TabList;
-import net.md_5.bungee.UserConnection;
-import net.md_5.bungee.protocol.Property;
 import net.md_5.bungee.protocol.packet.PlayerListItem;
 import net.md_5.bungee.protocol.packet.PlayerListItem.Item;
 import org.jetbrains.annotations.NotNull;
@@ -16,18 +12,16 @@ import java.util.UUID;
 /**
  * TabList handler for players between 1.8 and 1.19.2.<p>
  * Because BungeeCord does not have a TabList API, we need to use packets.
- * They are sent using an internal BungeeCord method that keeps track of them,
- * so they are removed on server switch to secure parity with Velocity.
  */
-@RequiredArgsConstructor
-public class BungeeTabList18 implements TabList {
+public class BungeeTabList18 extends BungeeTabList {
 
-    /** Player this TabList belongs to */
-    @NotNull
-    private final BungeeTabPlayer player;
+    public BungeeTabList18(@NotNull BungeeTabPlayer player) {
+        super(player);
+    }
 
     @Override
     public void removeEntry(@NotNull UUID entry) {
+        removeUuid(entry);
         sendPacket(PlayerListItem.Action.REMOVE_PLAYER, item(entry));
     }
 
@@ -54,38 +48,14 @@ public class BungeeTabList18 implements TabList {
 
     @Override
     public void addEntry(@NotNull Entry entry) {
-        Item item = item(entry.getUniqueId());
-        if (entry.getDisplayName() != null) item.setDisplayName(entry.getDisplayName().toString(player.getVersion()));
-        item.setGamemode(entry.getGameMode());
-        item.setPing(entry.getLatency());
-        if (entry.getSkin() != null) {
-            item.setProperties(new Property[]{new Property(TEXTURES_PROPERTY, entry.getSkin().getValue(), entry.getSkin().getSignature())});
-        } else {
-            item.setProperties(new Property[0]);
-        }
-        item.setUsername(entry.getName());
-        sendPacket(PlayerListItem.Action.ADD_PLAYER, item);
-    }
-
-    @NotNull
-    public Item item(@NotNull UUID id) {
-        Item item = new Item();
-        item.setUuid(id);
-        return item;
+        addUuid(entry.getUniqueId());
+        sendPacket(PlayerListItem.Action.ADD_PLAYER, entryToItem(entry));
     }
 
     private void sendPacket(@NotNull PlayerListItem.Action action, @NotNull Item item) {
         PlayerListItem packet = new PlayerListItem();
         packet.setAction(action);
         packet.setItems(new Item[]{item});
-        ((UserConnection)player.getPlayer()).getTabListHandler().onUpdate(packet);
-    }
-
-    @Override
-    public void setPlayerListHeaderFooter(@NotNull IChatBaseComponent header, @NotNull IChatBaseComponent footer) {
-        player.getPlayer().setTabHeader(
-                player.getPlatform().toComponent(header, player.getVersion()),
-                player.getPlatform().toComponent(footer, player.getVersion())
-        );
+        player.sendPacket(packet);
     }
 }