Fix crashes with null capability tiles.

Also concerns about missing capabilities.
This commit is contained in:
Ben Spiers committed 2016-05-07 13:38:02 +01:00
1 parent 84a04beab0
commit 628c5865ca
22 files changed
+97 -68

No files matched your search

@@ -13,6 +13,8 @@ import mekanism.common.capabilities.Capabilities;
import mekanism.common.network.PacketDataRequest.DataRequestMessage;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.TileEntityMultiblock;
import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.tileentity.TileEntity;
@@ -39,9 +41,9 @@ public class PacketDataRequest implements IMessageHandler<DataRequestMessage, IM
((TileEntityMultiblock)tileEntity).sendStructure = true;
}
if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
if(MekanismUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
{
IGridTransmitter transmitter = tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
IGridTransmitter transmitter = MekanismUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
if(transmitter.hasTransmitterNetwork())
{