diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index d55ee4cc3..765d6e059 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -850,8 +850,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock } super.breakBlock(world, pos, state); - - world.removeTileEntity(pos); } @Override diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index ce4729f8b..5683afb78 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -183,7 +183,7 @@ public abstract class UpdateProtocol> volume += locations.size(); - if(Math.abs(xmax-xmin)+1 <= 18 && Math.abs(xmax-xmin)+1 <= 18 && Math.abs(zmax-zmin)+1 <= 18) + if(Math.abs(xmax-xmin)+1 <= 18 && Math.abs(ymax-ymin)+1 <= 18 && Math.abs(zmax-zmin)+1 <= 18) { if(rightBlocks && rightFrame && isHollow && isCorner) { @@ -215,6 +215,11 @@ public abstract class UpdateProtocol> innerNodes.clear(); iteratedNodes.add(coord); + + if(iteratedNodes.size() > 2048) + { + return; + } for(EnumFacing side : EnumFacing.VALUES) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 1026aca55..befaafe8e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -257,7 +257,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I private boolean shouldTake(FluidStack fluid, Coord4D coord) { - if(fluid.getFluid() == FluidRegistry.WATER) + if(fluid.getFluid() == FluidRegistry.WATER || fluid.getFluid() == FluidRegistry.getFluid("heavywater")) { return general.pumpWaterSources; } diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index e79f9ff62..9046e53dd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -109,6 +109,11 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo @Override public double getMaxOutput() { + if(tier == EnergyCubeTier.CREATIVE) + { + return Integer.MAX_VALUE; + } + return tier.output; } diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index 835bc46ed..323cb827d 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -276,6 +276,8 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements @Override public void invalidate() { + super.invalidate(); + if(!worldObj.isRemote) { if(frequency != null)