Upstream merge: 1.7.9

By: Thinkofdeath <thethinkofdeath@gmail.com>

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

@@ -1,4 +1,4 @@
-From 3af39a545256010c77a43b92a78a6ffe89291f67 Mon Sep 17 00:00:00 2001
+From 33e15a4463401f66e8ca222ecfdb7584ec25af4d 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 4fb5f75..c164e39 100644
      // 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 d2a378e..9abf099 100644
+index cd9a8f5..8be8e9c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -793,6 +793,8 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig
+@@ -793,6 +793,8 @@ public abstract class PlayerList {
          // CraftBukkit end
      }
  
@@ -29,7 +29,7 @@ index d2a378e..9abf099 100644
      public void tick() {
          if (++this.t > 600) {
              this.t = 0;
-@@ -805,6 +807,30 @@ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig
+@@ -805,6 +807,30 @@ public abstract class PlayerList {
              this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping));
          }
          // CraftBukkit end */
@@ -61,5 +61,5 @@ index d2a378e..9abf099 100644
  
      public void sendAll(Packet packet) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0