51 lines
4.2 KiB
Diff
51 lines
4.2 KiB
Diff
--- a/net/minecraft/block/BlockFence.java
|
|
+++ b/net/minecraft/block/BlockFence.java
|
|
@@ -64,15 +64,12 @@
|
|
IBlockReader iblockreader = 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 = iblockreader.func_180495_p(blockpos1);
|
|
- IBlockState iblockstate1 = iblockreader.func_180495_p(blockpos2);
|
|
- IBlockState iblockstate2 = iblockreader.func_180495_p(blockpos3);
|
|
- IBlockState iblockstate3 = iblockreader.func_180495_p(blockpos4);
|
|
- return super.func_196258_a(p_196258_1_).func_206870_a(field_196409_a, Boolean.valueOf(this.func_196416_a(iblockstate, iblockstate.func_193401_d(iblockreader, blockpos1, EnumFacing.SOUTH)))).func_206870_a(field_196411_b, Boolean.valueOf(this.func_196416_a(iblockstate1, iblockstate1.func_193401_d(iblockreader, blockpos2, EnumFacing.WEST)))).func_206870_a(field_196413_c, Boolean.valueOf(this.func_196416_a(iblockstate2, iblockstate2.func_193401_d(iblockreader, blockpos3, EnumFacing.NORTH)))).func_206870_a(field_196414_y, Boolean.valueOf(this.func_196416_a(iblockstate3, iblockstate3.func_193401_d(iblockreader, blockpos4, EnumFacing.EAST)))).func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
|
|
+ return super.func_196258_a(p_196258_1_)
|
|
+ .func_206870_a(field_196409_a, canFenceConnectTo(iblockreader, blockpos, EnumFacing.NORTH))
|
|
+ .func_206870_a(field_196411_b, canFenceConnectTo(iblockreader, blockpos, EnumFacing.EAST))
|
|
+ .func_206870_a(field_196413_c, canFenceConnectTo(iblockreader, blockpos, EnumFacing.SOUTH))
|
|
+ .func_206870_a(field_196414_y, canFenceConnectTo(iblockreader, blockpos, EnumFacing.WEST))
|
|
+ .func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
|
|
}
|
|
|
|
public IBlockState func_196271_a(IBlockState p_196271_1_, EnumFacing p_196271_2_, IBlockState p_196271_3_, IWorld p_196271_4_, BlockPos p_196271_5_, BlockPos p_196271_6_) {
|
|
@@ -80,7 +77,7 @@
|
|
p_196271_4_.func_205219_F_().func_205360_a(p_196271_5_, Fluids.field_204546_a, Fluids.field_204546_a.func_205569_a(p_196271_4_));
|
|
}
|
|
|
|
- return p_196271_2_.func_176740_k().func_176716_d() == EnumFacing.Plane.HORIZONTAL ? p_196271_1_.func_206870_a(field_196415_z.get(p_196271_2_), Boolean.valueOf(this.func_196416_a(p_196271_3_, p_196271_3_.func_193401_d(p_196271_4_, p_196271_6_, p_196271_2_.func_176734_d())))) : super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
|
|
+ return p_196271_2_.func_176740_k().func_176716_d() == EnumFacing.Plane.HORIZONTAL ? p_196271_1_.func_206870_a(field_196415_z.get(p_196271_2_), Boolean.valueOf(this.canFenceConnectTo(p_196271_4_, p_196271_5_, p_196271_2_))) : super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
|
|
}
|
|
|
|
protected void func_206840_a(StateContainer.Builder<Block, IBlockState> p_206840_1_) {
|
|
@@ -90,4 +87,16 @@
|
|
public BlockFaceShape func_193383_a(IBlockReader p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_) {
|
|
return p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN ? BlockFaceShape.MIDDLE_POLE : BlockFaceShape.CENTER;
|
|
}
|
|
+
|
|
+ @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_196416_a(other, other.func_193401_d(world, pos.func_177972_a(facing), facing.func_176734_d()));
|
|
+ }
|
|
+
|
|
+ private boolean canFenceConnectTo(IBlockReader world, BlockPos pos, EnumFacing facing) {
|
|
+ BlockPos offset = pos.func_177972_a(facing);
|
|
+ IBlockState other = world.func_180495_p(offset);
|
|
+ return other.canBeConnectedTo(world, offset, facing.func_176734_d()) || func_176223_P().canBeConnectedTo(world, pos, facing);
|
|
+ }
|
|
}
|