Merge remote-tracking branch 'remotes/origin/1.15' into 1.16

# Conflicts:
#	build.gradle
This commit is contained in:
modmuss50 2020-04-11 15:40:23 +01:00
commit c2e74f070d
7 changed files with 92 additions and 3 deletions

View file

@ -71,7 +71,7 @@ public class FluidUtils {
FluidValue freeSpace = target.getCapacity(null).subtract(targetFluidInstance.getAmount());
if(!outputStack.isEmpty()){
if(outputStack.getCount() >= outputStack.getMaxCount()){
if(outputStack.getCount() >= outputStack.getMaxCount() || !outputStack.isItemEqual(itemFluidInfo.getEmpty())){
return false;
}
}
@ -109,7 +109,9 @@ public class FluidUtils {
if(!outputStack.isEmpty()){
if (outputStack.getCount() >= outputStack.getMaxCount()) return false;
if(!(outputStack.getItem() instanceof ItemFluidInfo)) return false;
if (!(outputStack.getItem() instanceof ItemFluidInfo)) return false;
if (!outputStack.isItemEqual(itemFluidInfo.getEmpty())) return false;
ItemFluidInfo outputFluidInfo = (ItemFluidInfo) outputStack.getItem();