Mirrors/Velocity
1
0
Fork 1
mirror of https://github.com/PaperMC/Velocity.git synced 2026-06-21 17:57:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix theoretical IOOBE race (#1799)

Browse Source
This commit is contained in:
Wouter Gritter
2026-05-22 16:50:48 +02:00
committed by GitHub
parent 9c0c9b0218
commit 38ff21afd7
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
proxy/src/main/java/com/velocitypowered/proxy/connection/util/ServerListPingHandler.java
View File

@@ -57,16 +57,16 @@ public class ServerListPingHandler {
List<ServerPing.SamplePlayer> samplePlayers; List<ServerPing.SamplePlayer> samplePlayers;
if (configuration.getSamplePlayersInPing()) { if (configuration.getSamplePlayersInPing()) {
List<ServerPing.SamplePlayer> unshuffledPlayers = server.getAllPlayers().stream() List<ServerPing.SamplePlayer> unshuffledPlayers = server.getAllPlayers().stream()
.map(p -> { .map(p -> {
if (p.getPlayerSettings().isClientListingAllowed()) { if (p.getPlayerSettings().isClientListingAllowed()) {
return new ServerPing.SamplePlayer(p.getUsername(), p.getUniqueId()); return new ServerPing.SamplePlayer(p.getUsername(), p.getUniqueId());
} else { } else {
return ServerPing.SamplePlayer.ANONYMOUS; return ServerPing.SamplePlayer.ANONYMOUS;
} }
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
Collections.shuffle(unshuffledPlayers); Collections.shuffle(unshuffledPlayers);
samplePlayers = unshuffledPlayers.subList(0, Math.min(12, server.getPlayerCount())); samplePlayers = unshuffledPlayers.subList(0, Math.min(12, unshuffledPlayers.size()));
} else { } else {
samplePlayers = ImmutableList.of(); samplePlayers = ImmutableList.of();
} }