From fbc7a5c063453e7ade8cea445a3a98fd9d3a0182 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Fri, 21 Sep 2012 10:12:39 -0400
Subject: [PATCH] Fix bug causing NPE if non-whitelisted player joins an FML
 server without FML installed

---
 common/cpw/mods/fml/common/network/FMLNetworkHandler.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
index 5d17ba4cda..8a77a7b3b4 100644
--- a/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
+++ b/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
@@ -120,6 +120,12 @@ public class FMLNetworkHandler
                 netLoginHandler.completeConnection("You don't have FML installed, you cannot connect to this server");
                 return;
             }
+            else
+            {
+                // Vanilla kicked us for some reason - bye now!
+                FMLLog.fine("Connection from %s was closed by vanilla minecraft", userName);
+                return;
+            }
 
         }
         switch (loginStates.get(netLoginHandler))