From eeeb4d37e822598f6dc3f6d9b7d59744521e7486 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Fri, 17 Jan 2014 17:05:06 -0500
Subject: [PATCH] Add exception logging to forge channel handlers as well

MinecraftForge/FML@53557dcd0582e09f7f35eb3bc2fd130fba3be4a0 Put logging exception handlers on all channel inbounds. Fix problem with failure to login. Closes #350
---
 fml                                                 |  2 +-
 .../common/network/DimensionMessageHandler.java     | 13 ++++++++++---
 .../network/FluidIdRegistryMessageHandler.java      |  9 +++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/fml b/fml
index 9c96ca4402..53557dcd05 160000
--- a/fml
+++ b/fml
@@ -1 +1 @@
-Subproject commit 9c96ca4402e4c231285f170281dd543bfffa191a
+Subproject commit 53557dcd0582e09f7f35eb3bc2fd130fba3be4a0
diff --git a/src/main/java/net/minecraftforge/common/network/DimensionMessageHandler.java b/src/main/java/net/minecraftforge/common/network/DimensionMessageHandler.java
index ae6dc23d35..7922109856 100644
--- a/src/main/java/net/minecraftforge/common/network/DimensionMessageHandler.java
+++ b/src/main/java/net/minecraftforge/common/network/DimensionMessageHandler.java
@@ -1,10 +1,11 @@
 package net.minecraftforge.common.network;
 
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.common.network.ForgeMessage.DimensionRegisterMessage;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.common.network.ForgeMessage.DimensionRegisterMessage;
+import org.apache.logging.log4j.Level;
+import cpw.mods.fml.common.FMLLog;
 
 public class DimensionMessageHandler extends SimpleChannelInboundHandler<ForgeMessage.DimensionRegisterMessage>{
     @Override
@@ -15,5 +16,11 @@ public class DimensionMessageHandler extends SimpleChannelInboundHandler<ForgeMe
             DimensionManager.registerDimension(msg.dimensionId, msg.providerId);
         }
     }
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+        FMLLog.log(Level.ERROR, cause, "DimensionMessageHandler exception");
+        super.exceptionCaught(ctx, cause);
+    }
 
 }
diff --git a/src/main/java/net/minecraftforge/common/network/FluidIdRegistryMessageHandler.java b/src/main/java/net/minecraftforge/common/network/FluidIdRegistryMessageHandler.java
index 7ba0825ca2..8694113b1d 100644
--- a/src/main/java/net/minecraftforge/common/network/FluidIdRegistryMessageHandler.java
+++ b/src/main/java/net/minecraftforge/common/network/FluidIdRegistryMessageHandler.java
@@ -1,5 +1,7 @@
 package net.minecraftforge.common.network;
 
+import org.apache.logging.log4j.Level;
+import cpw.mods.fml.common.FMLLog;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 
@@ -9,4 +11,11 @@ public class FluidIdRegistryMessageHandler extends SimpleChannelInboundHandler<F
     {
         // Do something with the message
     }
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+        FMLLog.log(Level.ERROR, cause, "FluidIdRegistryMessageHandler exception");
+        super.exceptionCaught(ctx, cause);
+    }
+
 }