keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Merge branch 'master' into noci-1.8.8

Browse source
This commit is contained in:
cpw 2015-11-14 09:36:08 -05:00
commit 06a2af3386
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
View file

@ -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()