diff options
| author | Martin Robertz <dream-master@gmx.net> | 2020-12-26 12:19:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-26 12:19:56 +0100 |
| commit | 934f0c779295ac6ea26b2c7995c252e8d6f06e55 (patch) | |
| tree | 203a234449e09f93a8416d203ebc378ba9659234 | |
| parent | 89860d7951b9d71775a97257c8fc27e942c03311 (diff) | |
| parent | 979129670881032a3047322b2b52a43845892431 (diff) | |
| download | GT5-Unofficial-934f0c779295ac6ea26b2c7995c252e8d6f06e55.tar.gz GT5-Unofficial-934f0c779295ac6ea26b2c7995c252e8d6f06e55.tar.bz2 GT5-Unofficial-934f0c779295ac6ea26b2c7995c252e8d6f06e55.zip | |
Merge pull request #7 from GTNewHorizons/fix-NPE-drainFluid
fix NPE crash on null fluid
| -rw-r--r-- | src/main/java/kekztech/MultiFluidHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/kekztech/MultiFluidHandler.java b/src/main/java/kekztech/MultiFluidHandler.java index 936ecf5042..399f9faa8b 100644 --- a/src/main/java/kekztech/MultiFluidHandler.java +++ b/src/main/java/kekztech/MultiFluidHandler.java @@ -383,7 +383,7 @@ public class MultiFluidHandler { return 0; } FluidStack tFluid = fluids[slot]; - if(tFluid == null && tFluid.equals(pull)) { + if(tFluid == null || !tFluid.equals(pull)) { return 0; } else { final int rec = Math.min(pull.amount, tFluid.amount); |