Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 11:06:29 +01:00
Code Issues Projects Releases Wiki Activity

Allow Changing of Player Sample in ServerListPingEvent

Browse Source
This commit is contained in:
willies952002 2017-07-20 18:59:51 -04:00 committed by Aikar
parent c6c6b4f69a
commit c86f61f8af
2 changed files with 105 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Spigot-API-Patches/0061-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch Normal file
View File

@ -0,0 +1,37 @@
From fd17520035a7195a2314c1648f29ae84c1d9233b Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Thu, 20 Jul 2017 18:05:36 -0400
Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent
diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
index 3c38d857..84de3ce4 100644
--- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
+++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
@@ -2,6 +2,7 @@ package org.bukkit.event.server;
import java.net.InetAddress;
import java.util.Iterator;
+import java.util.List;
import org.apache.commons.lang.Validate;
import org.bukkit.entity.Player;
@@ -145,4 +146,15 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
public Iterator<Player> iterator() throws UnsupportedOperationException {
throw new UnsupportedOperationException();
}
+
+ // Paper start
+ private java.util.List<String> sample;
+ public void setSampleText(java.util.List<String> sample) {
+ this.sample = sample;
+ }
+ public java.util.List<String> getSampleText() {
+ return sample;
+ }
+ // Paper end
+
}
--
2.11.0

68
Spigot-Server-Patches/0224-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch Normal file
View File

@ -0,0 +1,68 @@
From 7f0d85c43405c4264116b134f70986030240fd82 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
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<String> 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<GameProfile> profiles = new java.util.ArrayList<GameProfile>(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.13.0