SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.8.8 (Pre-)Release.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2015-07-27 22:19:19 +10:00
parent c0e326b62a
commit 332e77d249
7 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
paper-server/nms-patches/PacketStatusListener.patch
View File

@@ -16,8 +16,8 @@
+
public class PacketStatusListener implements PacketStatusInListener {
private final MinecraftServer minecraftServer;
@@ -12,11 +23,116 @@
private static final IChatBaseComponent a = new ChatComponentText("Status request has been handled.");
@@ -14,17 +25,116 @@
public void a(IChatBaseComponent ichatbasecomponent) {}
@@ -29,13 +29,16 @@
+ // CraftBukkit end
+
public void a(PacketStatusInStart packetstatusinstart) {
- this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aG()));
- if (this.d) {
+ // this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aG()));
+ // CraftBukkit start - fire ping event
+ if (state != WAITING) {
+ networkManager.close(null);
+ if (this.state != WAITING) {
this.networkManager.close(PacketStatusListener.a);
- } else {
- this.d = true;
- this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aG()));
+ return;
+ }
}
+ state = PING;
+ final Object[] players = minecraftServer.getPlayerList().players.toArray();
+ class ServerListPingEvent extends org.bukkit.event.server.ServerListPingEvent {
@@ -126,9 +129,10 @@
public void a(PacketStatusInPing packetstatusinping) {
- this.networkManager.handle(new PacketStatusOutPong(packetstatusinping.a()));
- this.networkManager.close(PacketStatusListener.a);
+ // CraftBukkit start
+ if (state != PING) {
+ networkManager.close(null);
+ this.networkManager.close(PacketStatusListener.a);
+ return;
+ }
+ state = DONE;