Anvilcraft/buildcraft
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix #3069

Browse source
This commit is contained in:
asiekierka 2015-10-12 19:03:25 +02:00
parent 213fe63f91
commit ca6b6647ed
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
buildcraft_resources/changelog/7.1.10
View file

@ -1,4 +1,5 @@
Bugs fixed:
* [#3072] PipeTransportFluids crash (proper fix) (asie)
* [#3069, #2865] Fluid pipe extraction speed ~25% lower than intended (asie, mconwa01)
* Rotated quarry not detecting its own frame (asie)

8
common/buildcraft/transport/PipeTransportFluids.java
View file

@ -335,15 +335,17 @@ public class PipeTransportFluids extends PipeTransport implements IFluidHandler,
inputPerTick[dir.ordinal()] = 0;
if (transferState[dir.ordinal()] != TransferState.Output) {
inputPerTick[dir.ordinal()] = sections[dir.ordinal()].drain(flowRate, false);
transferInCount++;
if (inputPerTick[dir.ordinal()] > 0) {
transferInCount++;
}
}
}
float min = Math.min(flowRate * transferInCount, spaceAvailable) / (float) flowRate / transferInCount;
for (ForgeDirection dir : directions) {
// Move liquid from input sides to the center
if (transferState[dir.ordinal()] != TransferState.Output && inputPerTick[dir.ordinal()] > 0) {
if (inputPerTick[dir.ordinal()] > 0) {
int amountToDrain = (int) (inputPerTick[dir.ordinal()] * min);
if (amountToDrain < 1) {
amountToDrain++;

3
common/buildcraft/transport/TileGenericPipe.java
View file

@ -816,8 +816,9 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler,
public boolean isPipeConnected(ForgeDirection with) {
if (worldObj.isRemote) {
return renderState.pipeConnectionMatrix.isConnected(with);
} else {
return pipeConnectionsBuffer[with.ordinal()];
}
return pipeConnectionsBuffer[with.ordinal()];
}
@Override