From cb2535fa951dede57d3c9d7116b3ebe11bc39942 Mon Sep 17 00:00:00 2001 From: Christian 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 --- .../cpw/mods/fml/common/network/FMLNetworkHandler.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java index 5d17ba4cda..8a77a7b3b4 100644 --- a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java +++ b/fml/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))