45 lines
3.4 KiB
Diff
45 lines
3.4 KiB
Diff
--- a/net/minecraft/block/BlockWall.java
|
|
+++ b/net/minecraft/block/BlockWall.java
|
|
@@ -51,6 +51,18 @@
|
|
return !func_194143_e(block) && p_196421_2_ == BlockFaceShape.SOLID || flag;
|
|
}
|
|
|
|
+ @Override
|
|
+ public boolean canBeConnectedTo(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing) {
|
|
+ IBlockState other = world.func_180495_p(pos.func_177972_a(facing));
|
|
+ return func_196421_a(other, other.func_193401_d(world, pos.func_177972_a(facing), facing.func_176734_d()));
|
|
+ }
|
|
+
|
|
+ private boolean canWallConnectTo(IBlockReader world, BlockPos pos, EnumFacing facing) {
|
|
+ BlockPos off = pos.func_177972_a(facing);
|
|
+ IBlockState other = world.func_180495_p(off);
|
|
+ return other.canBeConnectedTo(world, off, facing.func_176734_d()) || func_196421_a(other, other.func_193401_d(world, off, facing.func_176734_d()));
|
|
+ }
|
|
+
|
|
public static boolean func_194143_e(Block p_194143_0_) {
|
|
return Block.func_193382_c(p_194143_0_) || p_194143_0_ == Blocks.field_180401_cv || p_194143_0_ == Blocks.field_150440_ba || p_194143_0_ == Blocks.field_150423_aK || p_194143_0_ == Blocks.field_196625_cS || p_194143_0_ == Blocks.field_196628_cT || p_194143_0_ == Blocks.field_185778_de || p_194143_0_ == Blocks.field_150335_W;
|
|
}
|
|
@@ -59,18 +71,10 @@
|
|
IWorldReaderBase iworldreaderbase = p_196258_1_.func_195991_k();
|
|
BlockPos blockpos = p_196258_1_.func_195995_a();
|
|
IFluidState ifluidstate = p_196258_1_.func_195991_k().func_204610_c(p_196258_1_.func_195995_a());
|
|
- BlockPos blockpos1 = blockpos.func_177978_c();
|
|
- BlockPos blockpos2 = blockpos.func_177974_f();
|
|
- BlockPos blockpos3 = blockpos.func_177968_d();
|
|
- BlockPos blockpos4 = blockpos.func_177976_e();
|
|
- IBlockState iblockstate = iworldreaderbase.func_180495_p(blockpos1);
|
|
- IBlockState iblockstate1 = iworldreaderbase.func_180495_p(blockpos2);
|
|
- IBlockState iblockstate2 = iworldreaderbase.func_180495_p(blockpos3);
|
|
- IBlockState iblockstate3 = iworldreaderbase.func_180495_p(blockpos4);
|
|
- boolean flag = this.func_196421_a(iblockstate, iblockstate.func_193401_d(iworldreaderbase, blockpos1, EnumFacing.SOUTH));
|
|
- boolean flag1 = this.func_196421_a(iblockstate1, iblockstate1.func_193401_d(iworldreaderbase, blockpos2, EnumFacing.WEST));
|
|
- boolean flag2 = this.func_196421_a(iblockstate2, iblockstate2.func_193401_d(iworldreaderbase, blockpos3, EnumFacing.NORTH));
|
|
- boolean flag3 = this.func_196421_a(iblockstate3, iblockstate3.func_193401_d(iworldreaderbase, blockpos4, EnumFacing.EAST));
|
|
+ boolean flag = canWallConnectTo(iworldreaderbase, blockpos, EnumFacing.NORTH);
|
|
+ boolean flag1 = canWallConnectTo(iworldreaderbase, blockpos, EnumFacing.EAST);
|
|
+ boolean flag2 = canWallConnectTo(iworldreaderbase, blockpos, EnumFacing.SOUTH);
|
|
+ boolean flag3 = canWallConnectTo(iworldreaderbase, blockpos, EnumFacing.WEST);
|
|
boolean flag4 = (!flag || flag1 || !flag2 || flag3) && (flag || !flag1 || flag2 || !flag3);
|
|
return this.func_176223_P().func_206870_a(field_176256_a, Boolean.valueOf(flag4 || !iworldreaderbase.func_175623_d(blockpos.func_177984_a()))).func_206870_a(field_196409_a, Boolean.valueOf(flag)).func_206870_a(field_196411_b, Boolean.valueOf(flag1)).func_206870_a(field_196413_c, Boolean.valueOf(flag2)).func_206870_a(field_196414_y, Boolean.valueOf(flag3)).func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
|
|
}
|