Upstream merge, lots of conflicts

By: md_5 <git@md-5.net>

CraftBukkit-Patches/0102-Unfinalize-the-isDisconnected-method-by-bukkit.patch

@@ -0,0 +1,23 @@
+From 3b139e85ed73a132cdabd154374e843de01a1c15 Mon Sep 17 00:00:00 2001
+From: hcherndon <hcherndon@gmail.com>
+Date: Sat, 15 Feb 2014 01:51:20 -0600
+Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
+
+This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
+
+diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+index 0e46f3b..999cb64 100644
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/PlayerConnection.java
+@@ -1883,7 +1883,7 @@ public class PlayerConnection implements PacketPlayInListener {
+     }
+ 
+     // CraftBukkit start - Add "isDisconnected" method
+-    public final boolean isDisconnected() {
++    public boolean isDisconnected() {
+         return !this.player.joining && !NetworkManager.a(this.networkManager).config().isAutoRead();
+     }
+     // CraftBukkit end
+-- 
+1.9.1
+