From db3bebee13d989961632e446f9fff5181cd7a4b5 Mon Sep 17 00:00:00 2001 From: Thiakil Date: Fri, 15 Jun 2018 12:35:02 +0800 Subject: [PATCH] ensure PacketDataRequest doesn't load worlds --- .../java/mekanism/common/network/PacketDataRequest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 75139ef7c..384e113b0 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -19,7 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; @@ -33,11 +33,12 @@ public class PacketDataRequest implements IMessageHandler { - World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(message.coord4D.dimensionId); - TileEntity tileEntity = message.coord4D.getTileEntity(worldServer); + World worldServer = DimensionManager.getWorld(message.coord4D.dimensionId); if(worldServer != null) { + TileEntity tileEntity = message.coord4D.getTileEntity(worldServer); + if(tileEntity instanceof TileEntityMultiblock) { ((TileEntityMultiblock)tileEntity).sendStructure = true;