Merge remote-tracking branch 'origin/master' into mu

This commit is contained in:
Ruling-0 committed 2026-09-30 11:33:15 -05:00
commit 0674aae0ec
3 files changed
+16 -2

No files matched your search

@@ -135,7 +135,14 @@ public class StackInfo {
}
if (isFluidDisplayItem(stackA)) {
return isFluidDisplayItem(stackB) && getFluid(stackA).isFluidEqual(getFluid(stackB));
if (isFluidDisplayItem(stackB)) {
final FluidStack fluidA = getFluid(stackA);
final FluidStack fluidB = getFluid(stackB);
return fluidA != null && fluidA.isFluidEqual(fluidB);
}
return false;
}
if (stackA.getItem() != stackB.getItem()) {