mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-18 11:29:35 +00:00
Merge remote-tracking branch 'origin/master' into mu
This commit is contained in:
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()) {
|
||||
|
||||
Reference in new issue
Block a user