39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockPistonMoving.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonMoving.java
|
|
@@ -116,7 +116,7 @@
|
|
|
|
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
|
{
|
|
- if (!p_180653_1_.field_72995_K)
|
|
+ if (false && !p_180653_1_.field_72995_K) // Forge: Noop this out
|
|
{
|
|
TileEntityPiston tileentitypiston = this.func_185589_c(p_180653_1_, p_180653_2_);
|
|
|
|
@@ -126,6 +126,7 @@
|
|
iblockstate.func_177230_c().func_176226_b(p_180653_1_, p_180653_2_, iblockstate, 0);
|
|
}
|
|
}
|
|
+ super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, 1, p_180653_5_); // mimic vanilla behavior from above and ignore chance
|
|
}
|
|
|
|
@Nullable
|
|
@@ -210,6 +211,18 @@
|
|
return new BlockStateContainer(this, new IProperty[] {field_176426_a, field_176425_b});
|
|
}
|
|
|
|
+ @Override
|
|
+ public java.util.List<net.minecraft.item.ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
|
|
+ {
|
|
+ TileEntityPiston tileentitypiston = this.func_185589_c(world, pos);
|
|
+ if (tileentitypiston != null)
|
|
+ {
|
|
+ IBlockState pushed = tileentitypiston.func_174927_b();
|
|
+ return pushed.func_177230_c().getDrops(world, pos, pushed, fortune);
|
|
+ }
|
|
+ return new java.util.ArrayList();
|
|
+ }
|
|
+
|
|
public BlockFaceShape func_193383_a(IBlockAccess p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_)
|
|
{
|
|
return BlockFaceShape.UNDEFINED;
|