Fork/Velocitab
2
0
Fork 0
forked from Upstream/Velocitab
Code Pull Requests Actions Releases Activity

Ensure players on other servers are added as TabListEntries

Browse Source
This commit is contained in:
William 2023-02-25 12:27:28 +00:00
parent 96fbe94ae2
commit c70d4892a5
No known key found for this signature in database
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/net/william278/velocitab/tab/PlayerTabList.java
View File

@ -6,6 +6,7 @@ import com.velocitypowered.api.event.connection.DisconnectEvent;
import com.velocitypowered.api.event.player.ServerPostConnectEvent; import com.velocitypowered.api.event.player.ServerPostConnectEvent;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ServerConnection; import com.velocitypowered.api.proxy.ServerConnection;
import com.velocitypowered.api.proxy.player.TabListEntry;
import com.velocitypowered.api.proxy.server.ServerInfo; import com.velocitypowered.api.proxy.server.ServerInfo;
import de.themoep.minedown.adventure.MineDown; import de.themoep.minedown.adventure.MineDown;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
@ -14,6 +15,7 @@ import net.william278.velocitab.config.Placeholder;
import net.william278.velocitab.player.TabPlayer; import net.william278.velocitab.player.TabPlayer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Optional;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -88,13 +90,27 @@ public class PlayerTabList {
final ImmutableList<TabPlayer> players = ImmutableList.copyOf(this.players); final ImmutableList<TabPlayer> players = ImmutableList.copyOf(this.players);
players.forEach(player -> { players.forEach(player -> {
player.sendHeaderAndFooter(this); player.sendHeaderAndFooter(this);
player.getPlayer().getTabList().getEntries()
.forEach(entry -> players.stream() // Fill the tab list with the players
.filter(p -> p.getPlayer().getGameProfile().getId().equals(entry.getProfile().getId())) players.forEach(listedPlayer -> {
.findFirst().ifPresent(tabPlayer -> { final Optional<TabListEntry> current = player.getPlayer().getTabList().getEntries().stream()
entry.setDisplayName(tabPlayer.getDisplayName(plugin)); .filter(entry -> entry.getProfile().getId().equals(listedPlayer.getPlayer().getUniqueId()))
plugin.getScoreboardManager().setPlayerTeam(tabPlayer); .findFirst();
})); current.ifPresentOrElse(
entry -> entry.setDisplayName(listedPlayer.getDisplayName(plugin)),
() -> player.getPlayer().getTabList().addEntry(TabListEntry.builder()
.profile(listedPlayer.getPlayer().getGameProfile())
.displayName(listedPlayer.getDisplayName(plugin))
.latency((int) listedPlayer.getPlayer().getPing())
.build()));
plugin.getScoreboardManager().setPlayerTeam(listedPlayer);
});
// Remove players in the tab list that are not in the players list
player.getPlayer().getTabList().getEntries().stream()
.filter(entry -> players.stream()
.noneMatch(listedPlayer -> listedPlayer.getPlayer().getUniqueId().equals(entry.getProfile().getId())))
.forEach(entry -> player.getPlayer().getTabList().removeEntry(entry.getProfile().getId()));
}); });
} }