Upstream merge: 1.7.9

By: Thinkofdeath <thethinkofdeath@gmail.com>

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

@@ -1,21 +1,21 @@
-From 1a678d0c1e635bdb4e25f9b59488d1e094c33089 Mon Sep 17 00:00:00 2001
+From ededca7f1e9805ebe0941ac01665b45238bc4c22 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 8514dd6..6321eac 100644
+index 0c10e18..d1b9c49 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
-@@ -85,6 +85,7 @@ public class NetworkManager extends SimpleChannelInboundHandler {
+@@ -94,6 +94,7 @@ public class NetworkManager extends SimpleChannelInboundHandler {
+         }
  
-     public void exceptionCaught(ChannelHandlerContext channelhandlercontext, Throwable throwable) {
-         this.close(new ChatMessage("disconnect.genericReason", new Object[] { "Internal Exception: " + throwable}));
+         this.close(chatmessage);
 +        if (MinecraftServer.getServer().isDebugging()) throwable.printStackTrace(); // Spigot
      }
  
      protected void a(ChannelHandlerContext channelhandlercontext, Packet packet) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0