Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-05-12 23:58:19 +01:00
commit d51aa1bb44
759 files changed
+4994 -10570

No files matched your search

@@ -31,11 +31,10 @@ public class PacketDataRequest implements IMessageHandler<DataRequestMessage, IM
{
EntityPlayer player = PacketHandler.getPlayer(context);
World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(message.coord4D.dimensionId);
TileEntity tileEntity = message.coord4D.getTileEntity(worldServer);
if(worldServer != null && message.coord4D.getTileEntity(worldServer) instanceof ITileNetwork)
if(worldServer != null && tileEntity instanceof ITileNetwork)
{
TileEntity tileEntity = message.coord4D.getTileEntity(worldServer);
if(tileEntity instanceof TileEntityMultiblock)
{
((TileEntityMultiblock)tileEntity).sendStructure = true;