keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix block and torch placement logic not matching vanilla (#4210)

Browse source
This commit is contained in:
Ben Staddon 2017-10-02 23:58:30 +01:00 committed by LexManos
parent b4676f5a0b
commit 5cddcc0280
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/minecraft/net/minecraft/block/Block.java.patch
View file

@ -837,7 +837,7 @@
+ */ + */
+ public boolean canPlaceTorchOnTop(IBlockState state, IBlockAccess world, BlockPos pos) + public boolean canPlaceTorchOnTop(IBlockState state, IBlockAccess world, BlockPos pos)
+ { + {
+ if (state.func_193401_d(world, pos, EnumFacing.UP) == BlockFaceShape.SOLID) + if (state.func_185896_q() || state.func_193401_d(world, pos, EnumFacing.UP) == BlockFaceShape.SOLID)
+ { + {
+ return this != Blocks.field_185775_db && this != Blocks.field_150428_aP; + return this != Blocks.field_185775_db && this != Blocks.field_150428_aP;
+ } + }

5
patches/minecraft/net/minecraft/block/BlockDoor.java.patch
View file

@ -9,7 +9,7 @@
{ {
p_189540_2_.func_175698_g(p_189540_3_); p_189540_2_.func_175698_g(p_189540_3_);
flag1 = true; flag1 = true;
@@ -247,13 +247,13 @@ @@ -247,13 +247,14 @@
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_) public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
{ {
@ -21,7 +21,8 @@
else else
{ {
- return p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_185896_q() && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a()); - return p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_185896_q() && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
+ return p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_193401_d(p_176196_1_, p_176196_2_.func_177977_b(), EnumFacing.UP) == BlockFaceShape.SOLID && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a()); + IBlockState state = p_176196_1_.func_180495_p(p_176196_2_.func_177977_b());
+ return (state.func_185896_q() || state.func_193401_d(p_176196_1_, p_176196_2_.func_177977_b(), EnumFacing.UP) == BlockFaceShape.SOLID) && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
} }
} }