Upstream merge

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

CraftBukkit-Patches/0125-Print-Stack-on-InternalException.patch

@@ -0,0 +1,21 @@
+From a0d6415612a3f7ed22bbc82fc6a7ae2e14a1ca63 Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Sun, 13 Apr 2014 09:00:59 +1000
+Subject: [PATCH] Print Stack on InternalException
+
+
+diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
+index 0c10e18..d1b9c49 100644
+--- a/src/main/java/net/minecraft/server/NetworkManager.java
++++ b/src/main/java/net/minecraft/server/NetworkManager.java
+@@ -94,6 +94,7 @@ public class NetworkManager extends SimpleChannelInboundHandler {
+         }
+ 
+         this.close(chatmessage);
++        if (MinecraftServer.getServer().isDebugging()) throwable.printStackTrace(); // Spigot
+     }
+ 
+     protected void a(ChannelHandlerContext channelhandlercontext, Packet packet) {
+-- 
+1.9.1
+