From 18bd17dafe366621a3fbc064b7616aa24700744d Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 22 May 2016 03:29:01 -0400 Subject: [PATCH 1/2] Fixed Security Desk not invalidating --- src/main/java/mekanism/common/block/BlockBasic.java | 5 +---- .../java/mekanism/common/tile/TileEntitySecurityDesk.java | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index dd2299c0b..cea6e5be7 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -836,7 +836,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { return null; } - + return BasicType.get(blockType, metadata).create(); } @@ -918,8 +918,6 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } super.breakBlock(world, x, y, z, block, meta); - - world.removeTileEntity(x, y, z); } @Override @@ -974,7 +972,6 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { - float motion = 0.7F; double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index e466bdcd1..bbd60a9ec 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) From 1e0d04ab2b28c85d298932ddc650c9a7a11f5de1 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 22 May 2016 17:58:25 -0400 Subject: [PATCH 2/2] Fixed Energy Cube output, fixed multiblock max size, fixed Electric Pump heavy water pumping --- .../java/mekanism/common/multiblock/UpdateProtocol.java | 9 +++++++-- .../mekanism/common/tile/TileEntityElectricPump.java | 2 +- .../java/mekanism/common/tile/TileEntityEnergyCube.java | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 4c95d0e5c..474fa76e1 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -182,7 +182,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) { @@ -212,8 +212,13 @@ public abstract class UpdateProtocol> } } - innerNodes.clear(); + innerNodes.clear(); iteratedNodes.add(tile); + + if(iteratedNodes.size() > 2048) + { + return; + } for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 0320d420e..d2e78a603 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -256,7 +256,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 355c1ebb9..a4b6e9439 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -108,6 +108,11 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo @Override public double getMaxOutput() { + if(tier == EnergyCubeTier.CREATIVE) + { + return Integer.MAX_VALUE; + } + return tier.output; }