From 732782932a72f308e7271c035eaaf4a03ecdf9ce Mon Sep 17 00:00:00 2001 From: willies952002 Date: Fri, 5 May 2017 18:59:22 -0400 Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java index 313bb0007..45d6984f7 100644 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java @@ -5,6 +5,7 @@ import com.mojang.authlib.GameProfile; import io.netty.channel.ChannelFutureListener; import java.net.InetSocketAddress; import java.util.Iterator; +import java.util.UUID; import org.bukkit.craftbukkit.util.CraftIconCache; import org.bukkit.entity.Player; @@ -97,23 +98,44 @@ public class PacketStatusListener implements PacketStatusInListener { } } + // Paper start + java.util.List sample = new java.util.ArrayList<>(players.length); + for (Object player : players) { + if (player != null) sample.add(((EntityPlayer) player).getName()); + } + if (!sample.isEmpty()) { + java.util.Collections.shuffle(sample); + sample = sample.subList(0, Math.min(sample.size(), org.spigotmc.SpigotConfig.playerSample)); + } + // Paper end + ServerListPingEvent event = new ServerListPingEvent(); + event.setSampleText(sample); // Paper this.minecraftServer.server.getPluginManager().callEvent(event); - java.util.List profiles = new java.util.ArrayList(players.length); + // Paper start + if (event.getSampleText() != sample) sample = event.getSampleText(); + sample.forEach(line -> profiles.add(new GameProfile(UUID.randomUUID(), line))); + /* for (Object player : players) { if (player != null) { profiles.add(((EntityPlayer) player).getProfile()); } } + */ + // Paper end - ServerPing.ServerPingPlayerSample playerSample = new ServerPing.ServerPingPlayerSample(event.getMaxPlayers(), profiles.size()); + ServerPing.ServerPingPlayerSample playerSample = new ServerPing.ServerPingPlayerSample(event.getMaxPlayers(), minecraftServer.getPlayerList().getPlayerCount()); // Paper // Spigot Start + // Paper start - Move up + /* if ( !profiles.isEmpty() ) { java.util.Collections.shuffle( profiles ); // This sucks, its inefficient but we have no simple way of doing it differently profiles = profiles.subList( 0, Math.min( profiles.size(), org.spigotmc.SpigotConfig.playerSample ) ); // Cap the sample to n (or less) displayed players, ie: Vanilla behaviour } + */ + // Paper end // Spigot End playerSample.a(profiles.toArray(new GameProfile[profiles.size()])); -- 2.14.2