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

Fixed grate cause game freeze during block search phase

Browse source
This commit is contained in:
Calclavia 2014-02-24 19:40:50 +08:00
parent 41b89bed23
commit 2b5b496e56
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TileGrate.java
View file

@ -345,7 +345,7 @@ public class TileGrate extends TileAdvanced implements IFluidHandler
*/ */
public FluidStack tryDrain(int amount, boolean doDrain) public FluidStack tryDrain(int amount, boolean doDrain)
{ {
int tryAmount = 0; int drainedAmount = 0;
while (!drainNodes.isEmpty()) while (!drainNodes.isEmpty())
{ {
@ -354,37 +354,35 @@ public class TileGrate extends TileAdvanced implements IFluidHandler
if (!isConnected(fluidCoord.position)) if (!isConnected(fluidCoord.position))
{ {
TileGrate.this.resetPath(); TileGrate.this.resetPath();
return new FluidStack(fluidType, tryAmount); return new FluidStack(fluidType, drainedAmount);
} }
if (!this.fluidType.equals(FluidUtility.getFluidFromBlock(TileGrate.this.worldObj, fluidCoord.position))) if (FluidUtility.getFluidFromBlock(TileGrate.this.worldObj, fluidCoord.position) == null || this.fluidType.getID() != FluidUtility.getFluidFromBlock(TileGrate.this.worldObj, fluidCoord.position).getID())
{ {
this.drainNodes.poll(); this.drainNodes.poll();
} }
else else
{ {
int amount1 = FluidUtility.getFluidAmountFromBlock(TileGrate.this.worldObj, fluidCoord.position); int checkAmount = FluidUtility.getFluidAmountFromBlock(TileGrate.this.worldObj, fluidCoord.position);
if (amount1 == 0) if (checkAmount == 0)
{ {
this.drainNodes.poll(); this.drainNodes.poll();
} }
else else
{ {
if (tryAmount + amount1 <= amount)
{
tryAmount += amount1;
fluidCoord.position.setBlock(TileGrate.this.worldObj, 0);
this.drainNodes.poll();
if (tryAmount == amount)
return new FluidStack(fluidType, amount);
}
FluidStack fluidStack = FluidUtility.drainBlock(TileGrate.this.worldObj, fluidCoord.position, doDrain, 3); FluidStack fluidStack = FluidUtility.drainBlock(TileGrate.this.worldObj, fluidCoord.position, doDrain, 3);
if (fluidStack != null && fluidStack.amount > 0) this.drainNodes.poll();
if (fluidStack != null)
{ {
return new FluidStack(fluidType, fluidStack.amount); drainedAmount += fluidStack.amount;
if (drainedAmount > amount)
{
return new FluidStack(fluidType, drainedAmount);
}
} }
} }
} }

9
src/main/java/resonantinduction/core/prefab/fluid/PipeNetwork.java
View file

@ -118,10 +118,11 @@ public class PipeNetwork extends FluidNetwork
/** /**
* Apply "gravity pressure" * Apply "gravity pressure"
*/ */
/*if (i == 0) /*
pressure -= 25; * if (i == 0)
else if (i == 1) * pressure -= 25;
pressure += 25; * else if (i == 1)
* pressure += 25;
*/ */
minPressure = Math.min(pressure, minPressure); minPressure = Math.min(pressure, minPressure);
maxPressure = Math.max(pressure, maxPressure); maxPressure = Math.max(pressure, maxPressure);