Nearly done, testing time.

By: md_5 <git@md-5.net>

CraftBukkit-Patches/0121-Enable-Improved-Ping-Sending.patch

@@ -1,65 +0,0 @@
-From 09287f47fdadb27dcdc39c6914902d94e0e8f514 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 24 Feb 2013 20:45:20 +1100
-Subject: [PATCH] Enable Improved Ping Sending
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4fb5f75..c164e39 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -62,6 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public boolean keepLevel = false;
-     public double maxHealthCache;
-     public boolean joining = true;
-+    public int lastPing = -1; // Spigot
-     // CraftBukkit end
-     // Spigot start
-     public boolean collidesWithEntities = true;
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8a48ec2..9a052f7 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -804,6 +804,8 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig
-         // CraftBukkit end
-     }
- 
-+    private int currentPing = 0;
-+
-     public void tick() {
-         if (++this.t > 600) {
-             this.t = 0;
-@@ -816,6 +818,30 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig
-             this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping));
-         }
-         // CraftBukkit end */
-+        // Spigot start
-+        try
-+        {
-+            if ( !players.isEmpty() )
-+            {
-+                currentPing = ( currentPing + 1 ) % this.players.size();
-+                EntityPlayer player = (EntityPlayer) this.players.get( currentPing );
-+                if ( player.lastPing == -1 || Math.abs( player.ping - player.lastPing ) > 20 )
-+                {
-+                    Packet packet = new PacketPlayOutPlayerInfo( player.listName, true, player.ping );
-+                    for ( EntityPlayer splayer : (List<EntityPlayer>) this.players )
-+                    {
-+                        if ( splayer.getBukkitEntity().canSee( player.getBukkitEntity() ) )
-+                        {
-+                            splayer.playerConnection.sendPacket( packet );
-+                        }
-+                    }
-+                    player.lastPing = player.ping;
-+                }
-+            }
-+        } catch ( Exception e ) {
-+            // Better safe than sorry :)
-+        }
-+        // Spigot end
-     }
- 
-     public void sendAll(Packet packet) {
--- 
-1.8.3.2
-