From 355dd71d9eb17edd0b08f4553d8f1c54d92a537d Mon Sep 17 00:00:00 2001 From: Xander Date: Sun, 3 Dec 2017 21:12:10 +0800 Subject: [PATCH] prevent turbine from saying it filled more than it was even given --- .../common/tile/turbine/TileEntityTurbineValve.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index b9f379e94..001b6ceda 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -369,7 +369,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if(!canFill(from, resource != null ? resource.getFluid() : null)) + if(resource == null || !canFill(from, resource != null ? resource.getFluid() : null)) { return 0; } @@ -383,7 +383,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I if(filled < structure.getFluidCapacity() && structure.dumpMode != GasMode.IDLE) { - filled = structure.getFluidCapacity(); + filled = Math.min(structure.getFluidCapacity(), resource.amount); } return filled;