mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
32 lines
1.9 KiB
Diff
32 lines
1.9 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockPistonBase.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonBase.java
|
|
@@ -235,7 +235,7 @@
|
|
}
|
|
}
|
|
|
|
- if (!flag1 && iblockstate.func_185904_a() != Material.field_151579_a && func_185646_a(iblockstate, p_180648_1_, blockpos, enumfacing.func_176734_d(), false) && (iblockstate.func_185905_o() == EnumPushReaction.NORMAL || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
|
|
+ if (!flag1 && !iblockstate.func_177230_c().isAir(iblockstate, p_180648_1_, blockpos) && func_185646_a(iblockstate, p_180648_1_, blockpos, enumfacing.func_176734_d(), false) && (iblockstate.func_185905_o() == EnumPushReaction.NORMAL || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
|
|
{
|
|
this.func_176319_a(p_180648_1_, p_180648_2_, enumfacing, false);
|
|
}
|
|
@@ -320,7 +320,7 @@
|
|
return false;
|
|
}
|
|
|
|
- return !block.func_149716_u();
|
|
+ return !block.hasTileEntity(p_185646_0_);
|
|
}
|
|
else
|
|
{
|
|
@@ -366,7 +366,9 @@
|
|
{
|
|
BlockPos blockpos1 = (BlockPos)list2.get(j);
|
|
IBlockState iblockstate = p_176319_1_.func_180495_p(blockpos1);
|
|
- iblockstate.func_177230_c().func_176226_b(p_176319_1_, blockpos1, iblockstate, 0);
|
|
+ // Forge: With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior.
|
|
+ float chance = iblockstate.func_177230_c() instanceof BlockSnow ? -1.0f : 1.0f;
|
|
+ iblockstate.func_177230_c().func_180653_a(p_176319_1_, blockpos1, iblockstate, chance, 0);
|
|
p_176319_1_.func_175698_g(blockpos1);
|
|
--k;
|
|
aiblockstate[k] = iblockstate;
|