dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix npe in external storage when IFluidHandler goes away (#2944)

Browse Source
This commit is contained in:
Jeremiah Winsley
2021-06-12 11:12:23 -04:00
committed by GitHub
parent c4496c5702
commit b91e2abded
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java
View File

@@ -83,8 +83,11 @@ public class FluidExternalStorage implements IExternalStorage<FluidStack> {
return stack; return stack;
} }
if (context.acceptsFluid(stack)) { IFluidHandler handler = handlerSupplier.get();
int filled = handlerSupplier.get().fill(StackUtils.copy(stack, size), action == Action.PERFORM ? IFluidHandler.FluidAction.EXECUTE : IFluidHandler.FluidAction.SIMULATE);
if (context.acceptsFluid(stack) && handler != null) {
int filled = handler.fill(StackUtils.copy(stack, size), action == Action.PERFORM ? IFluidHandler.FluidAction.EXECUTE : IFluidHandler.FluidAction.SIMULATE);
if (filled == size) { if (filled == size) {
return FluidStack.EMPTY; return FluidStack.EMPTY;