keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix #3165 Dispensers with buckets can destroy fluid handler blocks (#3180)

Browse source
This commit is contained in:
James Mitchell 2016-08-12 01:36:18 -07:00 committed by LexManos
parent 704b683e27
commit f20d728ed7
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java
View file

@ -72,8 +72,6 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem
return super.dispenseStack(source, stack);
}
world.setBlockToAir(blockpos);
if (--stack.stackSize == 0)
{
stack.deserializeNBT(result.serializeNBT());

12
src/main/java/net/minecraftforge/fluids/FluidUtil.java
View file

@ -495,10 +495,16 @@ public class FluidUtil
return null;
}
IFluidHandler targetFluidHandler = FluidUtil.getFluidHandler(worldIn, pos, side);
if (targetFluidHandler != null)
IBlockState state = worldIn.getBlockState(pos);
Block block = state.getBlock();
if (block instanceof IFluidBlock || block instanceof BlockLiquid)
{
return FluidUtil.tryFillContainer(emptyContainer, targetFluidHandler, Integer.MAX_VALUE, playerIn, true);
IFluidHandler targetFluidHandler = FluidUtil.getFluidHandler(worldIn, pos, side);
if (targetFluidHandler != null)
{
return FluidUtil.tryFillContainer(emptyContainer, targetFluidHandler, Integer.MAX_VALUE, playerIn, true);
}
}
return null;
}