mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 19:15:32 +00:00
28 lines
2.0 KiB
Diff
28 lines
2.0 KiB
Diff
--- ../src-base/minecraft/net/minecraft/entity/item/EntityFallingBlock.java
|
|
+++ ../src-work/minecraft/net/minecraft/entity/item/EntityFallingBlock.java
|
|
@@ -166,6 +166,7 @@
|
|
{
|
|
IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos1);
|
|
|
|
+ if (this.field_70170_p.func_175623_d(new BlockPos(this.field_70165_t, this.field_70163_u - 0.009999999776482582D, this.field_70161_v))) //Forge: Don't indent below.
|
|
if (!flag1 && BlockFalling.func_185759_i(this.field_70170_p.func_180495_p(new BlockPos(this.field_70165_t, this.field_70163_u - 0.009999999776482582D, this.field_70161_v))))
|
|
{
|
|
this.field_70122_E = false;
|
|
@@ -182,14 +183,14 @@
|
|
|
|
if (!this.field_145808_f)
|
|
{
|
|
- if (this.field_70170_p.func_190527_a(block, blockpos1, true, EnumFacing.UP, (Entity)null) && (flag1 || !BlockFalling.func_185759_i(this.field_70170_p.func_180495_p(blockpos1.func_177977_b()))) && this.field_70170_p.func_180501_a(blockpos1, this.field_175132_d, 3))
|
|
+ if (this.field_70170_p.func_190527_a(block, blockpos1, true, EnumFacing.UP, this) && (flag1 || !BlockFalling.func_185759_i(this.field_70170_p.func_180495_p(blockpos1.func_177977_b()))) && this.field_70170_p.func_180501_a(blockpos1, this.field_175132_d, 3))
|
|
{
|
|
if (block instanceof BlockFalling)
|
|
{
|
|
((BlockFalling)block).func_176502_a_(this.field_70170_p, blockpos1, this.field_175132_d, iblockstate);
|
|
}
|
|
|
|
- if (this.field_145810_d != null && block instanceof ITileEntityProvider)
|
|
+ if (this.field_145810_d != null && block.hasTileEntity(this.field_175132_d))
|
|
{
|
|
TileEntity tileentity = this.field_70170_p.func_175625_s(blockpos1);
|
|
|