Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

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

@@ -1,4 +1,4 @@
-From d734e106f3f2185a88917e49ac96e4babe7ac606 Mon Sep 17 00:00:00 2001
+From 9423d32845eb0479a9049335fb2157dcbf4a6210 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
@@ -17,10 +17,10 @@ index 1dee8b2..4945955 100644
  
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 534073b..07cee4d 100644
+index 4383275..fa3e65c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -765,6 +765,25 @@ public abstract class PlayerList {
+@@ -775,6 +775,25 @@ public abstract class PlayerList {
              this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping));
          }
          // CraftBukkit end */
@@ -47,5 +47,5 @@ index 534073b..07cee4d 100644
  
      public void sendAll(Packet packet) {
 -- 
-1.8.3.2
+1.8.4.msysgit.0