Upstream merge.

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0029-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 7977f412b0d04e21881acf1d1fcae03631cdbe69 Mon Sep 17 00:00:00 2001
+From 1c934e1c78a8d17c3517bbcf230dc728aeeefe88 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 11:15:11 +1100
 Subject: [PATCH] BungeeCord Support
@@ -6,10 +6,10 @@ Subject: [PATCH] BungeeCord Support
 - Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin.
 
 diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
-index b433c60..0eacd84 100644
+index 7f2c1a9..5593b62 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -234,4 +234,17 @@ public class PendingConnection extends Connection {
+@@ -237,4 +237,17 @@ public class PendingConnection extends Connection {
      static boolean a(PendingConnection pendingconnection, boolean flag) {
          return pendingconnection.h = flag;
      }