Merge branch 'development' into 1.8.9

* development:
  Fixed Energy Cube output, fixed multiblock max size, fixed Electric Pump heavy water pumping
  Fixed Security Desk not invalidating

Conflicts:
	src/main/java/mekanism/common/block/BlockBasic.java
	src/main/java/mekanism/common/multiblock/UpdateProtocol.java
This commit is contained in:
aidancbrady committed 2016-05-22 18:42:56 -04:00
commit c8f3fcaee1
5 files changed
+14 -4

No files matched your search

@@ -850,8 +850,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock
}
super.breakBlock(world, pos, state);
world.removeTileEntity(pos);
}
@Override
@@ -183,7 +183,7 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
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<T extends SynchronizedData<T>>
innerNodes.clear();
iteratedNodes.add(coord);
if(iteratedNodes.size() > 2048)
{
return;
}
for(EnumFacing side : EnumFacing.VALUES)
{
@@ -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;
}
@@ -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;
}
@@ -276,6 +276,8 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements
@Override
public void invalidate()
{
super.invalidate();
if(!worldObj.isRemote)
{
if(frequency != null)