upstream/Applied-Energistics-2-Unofficial
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git synced 2026-10-26 14:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix NPE in AEFluidStackType#drainStackFromContainer (#1139)

Browse Source
This commit is contained in:
Alexdoru authored and GitHub committed 2026-03-18 08:46:42 +01:00
1 parent 78f1c19c84
commit 44d4314f80
1 file changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/item/AEFluidStackType.java
+5 -1
View File
@@ -110,10 +110,14 @@ public class AEFluidStackType implements IAEStackType<IAEFluidStack> {
itemStack.stackSize = 1;
if (itemStack.getItem() instanceof IFluidContainerItem container) {
FluidStack fluid = container.getFluid(itemStack);
if (fluid == null || !stack.getFluidStack().isFluidEqual(fluid))
if (fluid == null || !stack.getFluidStack().isFluidEqual(fluid)) {
return new ObjectLongImmutablePair<>(itemStack, 0);
}
FluidStack drained = container
.drain(itemStack, (int) Math.min(stack.getStackSize(), Integer.MAX_VALUE), true);
if (drained == null) {
return new ObjectLongImmutablePair<>(itemStack, 0);
}
return new ObjectLongImmutablePair<>(itemStack, drained.amount);
} else if (FluidContainerRegistry.isContainer(itemStack)) {
FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(itemStack);