21 lines
1.4 KiB
Diff
21 lines
1.4 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
|
|
@@ -71,7 +71,7 @@
|
|
|
|
public void func_180658_a(World p_180658_1_, BlockPos p_180658_2_, Entity p_180658_3_, float p_180658_4_)
|
|
{
|
|
- if (!p_180658_1_.field_72995_K && p_180658_1_.field_73012_v.nextFloat() < p_180658_4_ - 0.5F && p_180658_3_ instanceof EntityLivingBase && (p_180658_3_ instanceof EntityPlayer || p_180658_1_.func_82736_K().func_82766_b("mobGriefing")) && p_180658_3_.field_70130_N * p_180658_3_.field_70130_N * p_180658_3_.field_70131_O > 0.512F)
|
|
+ if (!p_180658_1_.field_72995_K && p_180658_3_.canTrample(p_180658_1_, this, p_180658_2_, p_180658_4_)) // Forge: Move logic to Entity#canTrample
|
|
{
|
|
this.func_190970_b(p_180658_1_, p_180658_2_);
|
|
}
|
|
@@ -94,7 +94,7 @@
|
|
private boolean func_176529_d(World p_176529_1_, BlockPos p_176529_2_)
|
|
{
|
|
Block block = p_176529_1_.func_180495_p(p_176529_2_.func_177984_a()).func_177230_c();
|
|
- return block instanceof BlockCrops || block instanceof BlockStem;
|
|
+ return block instanceof net.minecraftforge.common.IPlantable && canSustainPlant(p_176529_1_.func_180495_p(p_176529_2_), p_176529_1_, p_176529_2_, net.minecraft.util.EnumFacing.UP, (net.minecraftforge.common.IPlantable)block);
|
|
}
|
|
|
|
private boolean func_176530_e(World p_176530_1_, BlockPos p_176530_2_)
|