upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Mitchell authored and LexManos committed 2016-08-12 01:36:18 -07:00
1 parent 704b683e27
commit f20d728ed7
2 files changed
+9 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java
-2
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());
src/main/java/net/minecraftforge/fluids/FluidUtil.java
+9 -3
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;
}