diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java index 189631d0..50f6ae60 100644 --- a/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java +++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java @@ -293,11 +293,14 @@ public class PartMultimeter extends PartFace implements IConnector 0) - maxPressure--; + maxPressure -= 1; sourcePipe.setPressure(Math.max(minPressure, Math.min(maxPressure, totalPressure / findCount + Integer.signum(totalPressure)))); } @@ -161,10 +170,11 @@ public class PipeNetwork extends FluidNetwork if (pressureA >= pressureB) { FluidTank tankA = sourcePipe.getInternalTank(); + FluidStack fluidA = tankA.getFluid(); - if (tankA != null) + if (tankA != null && fluidA != null) { - int amountA = tankA.getFluidAmount(); + int amountA = fluidA.amount; if (amountA > 0) { @@ -180,7 +190,7 @@ public class PipeNetwork extends FluidNetwork if (quantity > 0) { tankA.drain(quantity, true); - tankB.fill(new FluidStack(tankA.getFluid().getFluid(), quantity), true); + tankB.fill(new FluidStack(fluidA.getFluid(), quantity), true); } } }