From 80b3f0fd97bede506d457c087a99e002bba6e4fe Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Mon, 13 Aug 2012 11:52:30 -0400
Subject: [PATCH] Capture server packet handling errors into the FML log file
 for diagnostics

---
 .../src/NetworkListenThread.java.patch        | 19 +++++++++++++++++++
 .../src/ServerListenThread.java.patch         | 17 +++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 fml/patches/common/net/minecraft/src/NetworkListenThread.java.patch
 create mode 100644 fml/patches/common/net/minecraft/src/ServerListenThread.java.patch

diff --git a/fml/patches/common/net/minecraft/src/NetworkListenThread.java.patch b/fml/patches/common/net/minecraft/src/NetworkListenThread.java.patch
new file mode 100644
index 000000000..f17a544c1
--- /dev/null
+++ b/fml/patches/common/net/minecraft/src/NetworkListenThread.java.patch
@@ -0,0 +1,19 @@
+--- ../src-base/common/net/minecraft/src/NetworkListenThread.java
++++ ../src-work/common/net/minecraft/src/NetworkListenThread.java
+@@ -6,6 +6,8 @@
+ import java.util.List;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
++
++import cpw.mods.fml.common.FMLLog;
+ import net.minecraft.server.MinecraftServer;
+ 
+ public abstract class NetworkListenThread
+@@ -43,6 +45,7 @@
+             }
+             catch (Exception var4)
+             {
++                FMLLog.log(Level.SEVERE, var4, "A critical server error occured handling a packet, kicking %s", var2);
+                 field_71751_a.log(Level.WARNING, "Failed to handle packet: " + var4, var4);
+                 var2.func_72565_c("Internal server error");
+             }
diff --git a/fml/patches/common/net/minecraft/src/ServerListenThread.java.patch b/fml/patches/common/net/minecraft/src/ServerListenThread.java.patch
new file mode 100644
index 000000000..2fdcbbf01
--- /dev/null
+++ b/fml/patches/common/net/minecraft/src/ServerListenThread.java.patch
@@ -0,0 +1,17 @@
+--- ../src-base/common/net/minecraft/src/ServerListenThread.java
++++ ../src-work/common/net/minecraft/src/ServerListenThread.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.src;
+ 
++import cpw.mods.fml.common.FMLLog;
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
+ import java.io.IOException;
+@@ -51,6 +52,7 @@
+                 catch (Exception var6)
+                 {
+                     var3.func_72527_a("Internal server error");
++                    FMLLog.log(Level.SEVERE, var6, "Error handling login related packet - connection from %s refused", var3.field_72543_h);
+                     field_71777_a.log(Level.WARNING, "Failed to handle packet: " + var6, var6);
+                 }
+