From aa18bed75ec2fc45ea8a6141a01c4b6b195fb204 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Tue, 21 May 2013 11:01:50 -0400
Subject: [PATCH] Fix server side derp with Forge network packet handler

---
 fml/common/cpw/mods/fml/common/InjectedModContainer.java   | 4 ++--
 .../cpw/mods/fml/common/network/FMLNetworkHandler.java     | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/fml/common/cpw/mods/fml/common/InjectedModContainer.java b/fml/common/cpw/mods/fml/common/InjectedModContainer.java
index bae961322..bc4f5017a 100644
--- a/fml/common/cpw/mods/fml/common/InjectedModContainer.java
+++ b/fml/common/cpw/mods/fml/common/InjectedModContainer.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the GNU Lesser Public License v2.1
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * 
+ *
  * Contributors:
  *     cpw - implementation
  */
@@ -25,7 +25,7 @@ import cpw.mods.fml.common.versioning.VersionRange;
 public class InjectedModContainer implements ModContainer
 {
     private File source;
-    private ModContainer wrappedContainer;
+    public final ModContainer wrappedContainer;
 
     public InjectedModContainer(ModContainer mc, File source)
     {
diff --git a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
index f21f78fb1..52ea2aed1 100644
--- a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
+++ b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
@@ -5,7 +5,7 @@
  * are made available under the terms of the GNU Lesser Public License v2.1
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * 
+ *
  * Contributors:
  *     cpw - implementation
  */
@@ -41,6 +41,7 @@ import com.google.common.hash.Hashing;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.InjectedModContainer;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.discovery.ASMDataTable;
@@ -269,6 +270,10 @@ public class FMLNetworkHandler
 
     public NetworkModHandler findNetworkModHandler(Object mc)
     {
+        if (mc instanceof InjectedModContainer)
+        {
+            return networkModHandlers.get(((InjectedModContainer)mc).wrappedContainer);
+        }
         if (mc instanceof ModContainer)
         {
             return networkModHandlers.get(mc);