fix NPE when trying to drain a tank in a tank tower (#390)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
danyadevandgithub-actions[bot] authored and GitHub committed 2026-01-13 11:54:36 -05:00
1 parent 72a068b6d6
commit f4c6d8a3f0
1 file changed
+6 -2
@@ -70,6 +70,10 @@ public class TileCertusQuartzTank extends TileEntity implements IFluidHandler {
return mainTank.drain(fluid, amount, doDrain, false);
}
if (this.getFluid() == null) {
return null;
}
FluidStack drainedFluid = this.tank.drain(amount, doDrain);
int drained = drainedFluid != null ? drainedFluid.amount : 0;
@@ -80,10 +84,10 @@ public class TileCertusQuartzTank extends TileEntity implements IFluidHandler {
if (drained < amount) {
TileCertusQuartzTank tankBelow = this.getTankBelow();
if (tankBelow != null) {
FluidStack externallyDrained = tankBelow.drain(fluid, amount - drained, doDrain, false);
FluidStack externallyDrained = tankBelow.drain(this.getFluid(), amount - drained, doDrain, false);
if (externallyDrained != null) {
return new FluidStack(fluid, drained + externallyDrained.amount);
return new FluidStack(this.getFluid(), drained + externallyDrained.amount);
}
}
}