From 159ca09c54483967b3a71bc608d22a4b623291b2 Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 23 Oct 2016 14:07:24 -0700 Subject: [PATCH] Special case not drooping snowballs for water and snow layers. Closes #3326 --- .../net/minecraft/block/BlockDynamicLiquid.java.patch | 8 ++++++++ .../java/net/minecraftforge/fluids/BlockFluidBase.java | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.java.patch b/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.java.patch index b73df79bc1..b9e1e3a6d5 100644 --- a/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockDynamicLiquid.java.patch @@ -9,3 +9,11 @@ { IBlockState iblockstate = p_180650_1_.func_180495_p(p_180650_2_.func_177977_b()); +@@ -166,6 +166,7 @@ + } + else + { ++ if (p_176375_3_.func_177230_c() != Blocks.field_150431_aC) //Forge: Vanilla has a 'bug' where snowballs don't drop like every other block. So special case because ewww... + p_176375_3_.func_177230_c().func_176226_b(p_176375_1_, p_176375_2_, p_176375_3_, 0); + } + } diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java index 9c457dd3b3..b356fd50a7 100644 --- a/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java +++ b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java @@ -280,7 +280,8 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock { if (displacements.get(block)) { - block.dropBlockAsItem(world, pos, state, 0); + if (state.getBlock() != Blocks.SNOW_LAYER) //Forge: Vanilla has a 'bug' where snowballs don't drop like every other block. So special case because ewww... + block.dropBlockAsItem(world, pos, state, 0); return true; } return false;