Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 18:31:18 +02:00
Code Issues Projects Releases Wiki Activity

SPIGOT-1219: Allow ping without status query.

Browse Source 
Also minor refactor to use more of the Vanilla logic.
This commit is contained in:
md_5 2015-10-03 11:25:43 +10:00
parent d4e32cef0c
commit 4a7472d0bf
1 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nms-patches/PacketStatusListener.patch
View File

@ -17,29 +17,18 @@
public class PacketStatusListener implements PacketStatusInListener {
private static final IChatBaseComponent a = new ChatComponentText("Status request has been handled.");
@@ -14,17 +25,116 @@
public void a(IChatBaseComponent ichatbasecomponent) {}
+ // CraftBukkit start
+ private static final int WAITING = 0;
+ private static final int PING = 1;
+ private static final int DONE = 2;
+ private int state = WAITING;
+ // CraftBukkit end
+
@@ -17,10 +28,96 @@
public void a(PacketStatusInStart packetstatusinstart) {
- if (this.d) {
+ // this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aG()));
+ // CraftBukkit start - fire ping event
+ if (this.state != WAITING) {
if (this.d) {
this.networkManager.close(PacketStatusListener.a);
- } else {
- this.d = true;
- this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aG()));
+ // CraftBukkit start - fire ping event
+ return;
}
+ state = PING;
+ }
+ this.d = true;
+ // this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aG()));
+ final Object[] players = minecraftServer.getPlayerList().players.toArray();
+ class ServerListPingEvent extends org.bukkit.event.server.ServerListPingEvent {
+ CraftIconCache icon = minecraftServer.server.getServerIcon();
@ -112,7 +101,7 @@
+ if (player != null) {
+ profiles.add(((EntityPlayer) player).getProfile());
+ }
+ }
}
+
+ ServerPing.ServerPingPlayerSample playerSample = new ServerPing.ServerPingPlayerSample(event.getMaxPlayers(), profiles.size());
+ playerSample.a(profiles.toArray(new GameProfile[profiles.size()]));
@ -128,15 +117,3 @@
}
public void a(PacketStatusInPing packetstatusinping) {
- this.networkManager.handle(new PacketStatusOutPong(packetstatusinping.a()));
- this.networkManager.close(PacketStatusListener.a);
+ // CraftBukkit start
+ if (state != PING) {
+ this.networkManager.close(PacketStatusListener.a);
+ return;
+ }
+ state = DONE;
+ this.networkManager.a(new PacketStatusOutPong(packetstatusinping.a()), ChannelFutureListener.CLOSE); // Close on completion
+ // CraftBukkit end
}
}