Upstream merge + remove 3 pulled patches.

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

CraftBukkit-Patches/0029-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 1c934e1c78a8d17c3517bbcf230dc728aeeefe88 Mon Sep 17 00:00:00 2001
+From ba5620ccf386fd94ddce7fe2158550ece485f03a 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
@@ -28,10 +28,10 @@ index 7f2c1a9..5593b62 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0f17c90..388acf9 100644
+index 5dafeaf..a85fc5b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -295,7 +295,7 @@ public abstract class PlayerList {
+@@ -296,7 +296,7 @@ public abstract class PlayerList {
          // depending on the outcome.
          EntityPlayer entity = new EntityPlayer(this.server, this.server.getWorldServer(0), s, this.server.O() ? new DemoPlayerInteractManager(this.server.getWorldServer(0)) : new PlayerInteractManager(this.server.getWorldServer(0)));
          Player player = entity.getBukkitEntity();