Merge pull request #2117 from lumien231/master
Fixes Client Login Issue when logging into a non existent dimension
This commit is contained in:
commit
41e971ecc9
1 changed files with 7 additions and 5 deletions
|
@ -34,6 +34,7 @@ import net.minecraft.network.play.server.S3FPacketCustomPayload;
|
||||||
import net.minecraft.network.play.server.S40PacketDisconnect;
|
import net.minecraft.network.play.server.S40PacketDisconnect;
|
||||||
import net.minecraft.server.management.ServerConfigurationManager;
|
import net.minecraft.server.management.ServerConfigurationManager;
|
||||||
import net.minecraft.util.ChatComponentText;
|
import net.minecraft.util.ChatComponentText;
|
||||||
|
import net.minecraftforge.common.DimensionManager;
|
||||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||||
import net.minecraftforge.fml.common.FMLLog;
|
import net.minecraftforge.fml.common.FMLLog;
|
||||||
import net.minecraftforge.fml.common.network.FMLNetworkEvent;
|
import net.minecraftforge.fml.common.network.FMLNetworkEvent;
|
||||||
|
@ -199,12 +200,13 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
|
||||||
NBTTagCompound playerNBT = scm.getPlayerNBT(player);
|
NBTTagCompound playerNBT = scm.getPlayerNBT(player);
|
||||||
if (playerNBT!=null)
|
if (playerNBT!=null)
|
||||||
{
|
{
|
||||||
return playerNBT.getInteger("Dimension");
|
int dimension = playerNBT.getInteger("Dimension");
|
||||||
}
|
if (DimensionManager.isDimensionRegistered(dimension))
|
||||||
else
|
{
|
||||||
{
|
return dimension;
|
||||||
return 0;
|
}
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void clientListenForServerHandshake()
|
void clientListenForServerHandshake()
|
||||||
|
|
Loading…
Reference in a new issue