Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0062-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 8ee5fd0371c74a972cf943018b8995dd650530ae Mon Sep 17 00:00:00 2001
+From 15c5a59473436856080f7fa581726e9c53666a4a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support
 Provides support for IP forwarding via BungeeCord.
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 9533fd1..6098eb5 100644
+index ff7b3d3..a517306 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -73,6 +73,19 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -82,10 +82,10 @@ index 8f829bb..6b2fbb9 100644
 +    // Spigot End
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f8e43d1..7eb95e2 100644
+index 1b902b2..a85b08e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1261,6 +1261,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1259,6 +1259,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      {
  
          @Override