Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0062-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From c2948884ea9ec5d3a413a650899d358e29f26792 Mon Sep 17 00:00:00 2001
+From 8ee5fd0371c74a972cf943018b8995dd650530ae 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,10 +6,10 @@ 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 b96e2ef..fe2098e 100644
+index 9533fd1..6098eb5 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
-@@ -28,6 +28,19 @@ public class HandshakeListener implements PacketHandshakingInListener {
+@@ -73,6 +73,19 @@ public class HandshakeListener implements PacketHandshakingInListener {
                  this.b.a((IChatBaseComponent) chatcomponenttext);
              } else {
                  this.b.a((PacketListener) (new LoginListener(this.a, this.b)));
@@ -82,7 +82,7 @@ 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 5219468..3c17e2f 100644
+index f8e43d1..7eb95e2 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 {
@@ -99,7 +99,7 @@ index 5219468..3c17e2f 100644
          {
              return getHandle().collidesWithEntities;
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 4152452..a43c373 100644
+index 2ea1be7..08bd5ba 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -181,4 +181,14 @@ public class SpigotConfig
@@ -118,5 +118,5 @@ index 4152452..a43c373 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.4.msysgit.0