From 9f0e564013427a84dcab0298f7fab210857de10e Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 22 Jul 2014 21:13:01 +0100 Subject: [PATCH 1/2] Fix some Server-side packets being sent by the client Conflicts: src/main/java/mekanism/common/tile/TileEntityEnergyCube.java --- src/main/java/mekanism/common/tile/TileEntityBasicBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java index 7cd71e50a..882b84736 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java @@ -182,7 +182,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench facing = direction; } - if(facing != clientFacing) + if(!(facing == clientFacing || worldObj.isRemote)) { Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), worldObj.provider.dimensionId); worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); From 32a52c5f03dd12052bf9841e6d6e32d1b10fedf8 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 3 Aug 2014 03:14:17 +0100 Subject: [PATCH 2/2] Fix the BuildCraft leak quickly This is already solved in development branches but that commit would pull in a bunch of other stuff as well. --- src/main/java/mekanism/common/tile/TileEntityElectricBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index d4e426cde..7b3d44737 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -210,7 +210,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "BuildCraftAPI|power") protected void reconfigure() { - powerHandler.configure(1, (float)((getMaxEnergy()-getEnergy())*Mekanism.TO_BC), 0, (float)(getMaxEnergy()*Mekanism.TO_BC)); + powerHandler.configure(0, (float)((getMaxEnergy()-getEnergy())*Mekanism.TO_BC), 0, (float)(getMaxEnergy()*Mekanism.TO_BC)); } @Override