From 39e77bf4688b54f3463d2875f9e563d479cbc70c Mon Sep 17 00:00:00 2001
From: Lumien <lumien231@users.noreply.github.com>
Date: Mon, 21 Sep 2015 14:58:16 +0200
Subject: [PATCH] Fix Client Login Issue when logging into a non existent
 dimension

---
 .../common/network/handshake/NetworkDispatcher.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java b/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
index aa9412512c..7933d901e9 100644
--- a/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
+++ b/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
@@ -34,6 +34,7 @@ import net.minecraft.network.play.server.S3FPacketCustomPayload;
 import net.minecraft.network.play.server.S40PacketDisconnect;
 import net.minecraft.server.management.ServerConfigurationManager;
 import net.minecraft.util.ChatComponentText;
+import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.FMLLog;
 import net.minecraftforge.fml.common.network.FMLNetworkEvent;
@@ -199,12 +200,13 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
         NBTTagCompound playerNBT = scm.getPlayerNBT(player);
         if (playerNBT!=null)
         {
-            return playerNBT.getInteger("Dimension");
-        }
-        else
-        {
-            return 0;
+            int dimension = playerNBT.getInteger("Dimension");
+            if (DimensionManager.isDimensionRegistered(dimension))
+            {
+        	    return dimension;
+            }
         }
+        return 0;
     }
 
     void clientListenForServerHandshake()