42 lines
2.5 KiB
Diff
42 lines
2.5 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockWall.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockWall.java
|
|
@@ -159,10 +159,10 @@
|
|
|
|
public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
|
|
{
|
|
- boolean flag = this.func_176253_e(p_176221_2_, p_176221_3_.func_177978_c(), EnumFacing.SOUTH);
|
|
- boolean flag1 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177974_f(), EnumFacing.WEST);
|
|
- boolean flag2 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177968_d(), EnumFacing.NORTH);
|
|
- boolean flag3 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177976_e(), EnumFacing.EAST);
|
|
+ boolean flag = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH);
|
|
+ boolean flag1 = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST);
|
|
+ boolean flag2 = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH);
|
|
+ boolean flag3 = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST);
|
|
boolean flag4 = flag && !flag1 && flag2 && !flag3 || !flag && flag1 && !flag2 && flag3;
|
|
return p_176221_1_.func_177226_a(field_176256_a, Boolean.valueOf(!flag4 || !p_176221_2_.func_175623_d(p_176221_3_.func_177984_a()))).func_177226_a(field_176254_b, Boolean.valueOf(flag)).func_177226_a(field_176257_M, Boolean.valueOf(flag1)).func_177226_a(field_176258_N, Boolean.valueOf(flag2)).func_177226_a(field_176259_O, Boolean.valueOf(flag3));
|
|
}
|
|
@@ -177,6 +177,23 @@
|
|
return p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN ? BlockFaceShape.MIDDLE_POLE_THICK : BlockFaceShape.CENTER_BIG;
|
|
}
|
|
|
|
+ /* ======================================== FORGE START ======================================== */
|
|
+
|
|
+ @Override
|
|
+ public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
|
+ {
|
|
+ return func_176253_e(world, pos.func_177972_a(facing), facing.func_176734_d());
|
|
+ }
|
|
+
|
|
+ private boolean canWallConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
|
+ {
|
|
+ BlockPos other = pos.func_177972_a(facing);
|
|
+ Block block = world.func_180495_p(other).func_177230_c();
|
|
+ return block.canBeConnectedTo(world, other, facing.func_176734_d()) || func_176253_e(world, other, facing.func_176734_d());
|
|
+ }
|
|
+
|
|
+ /* ======================================== FORGE END ======================================== */
|
|
+
|
|
public static enum EnumType implements IStringSerializable
|
|
{
|
|
NORMAL(0, "cobblestone", "normal"),
|