Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction

Browse source
This commit is contained in:
Calclavia 2014-01-20 21:37:41 +08:00
commit fea61d5241
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java
View file

@ -355,11 +355,6 @@ public abstract class PartFramedConnection<M extends Enum, C extends IConnector<
@Override @Override
public boolean canConnect(ForgeDirection direction) public boolean canConnect(ForgeDirection direction)
{ {
if (world().isBlockIndirectlyGettingPowered(x(), y(), z()))
{
return false;
}
Vector3 connectPos = new Vector3(tile()).translate(direction); Vector3 connectPos = new Vector3(tile()).translate(direction);
TileEntity connectTile = connectPos.getTileEntity(world()); TileEntity connectTile = connectPos.getTileEntity(world());
return !isConnectionPrevented(connectTile, direction); return !isConnectionPrevented(connectTile, direction);

2
src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java
View file

@ -131,7 +131,7 @@ public abstract class FluidNetwork extends NodeNetwork<IFluidNetwork, IFluidConn
FluidStack before = this.getTank().getFluid(); FluidStack before = this.getTank().getFluid();
FluidStack drain = this.getTank().drain(resource.amount, doDrain); FluidStack drain = this.getTank().drain(resource.amount, doDrain);
if (before != this.getTank().getFluid() || this.getTank().getFluid() == null || this.getTank().getFluid().amount != before.amount) if (!FluidUtility.matchExact(before, drain))
{ {
this.reconstructTankInfo(); this.reconstructTankInfo();
} }