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

Patch EntityPlayerSP to use location-aware version of isNormalCube (#3494)

This commit is contained in:
Ben Staddon 2016-12-17 21:23:04 +00:00 committed by LexManos
parent 20e026e601
commit 4530967009
2 changed files with 5 additions and 4 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

@ -247,7 +247,7 @@
+ */ + */
+ public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) + public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos)
+ { + {
+ return state.func_185904_a().func_76218_k() && state.func_185917_h() && !state.func_185897_m(); + return state.func_185915_l();
+ } + }
+ +
+ /** + /**

7
patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
View File

@ -56,16 +56,17 @@
{ {
d2 = 1.0D - d1; d2 = 1.0D - d1;
i = 5; i = 5;
@@ -498,7 +511,7 @@ @@ -498,7 +511,8 @@
private boolean func_175162_d(BlockPos p_175162_1_) private boolean func_175162_d(BlockPos p_175162_1_)
{ {
- return !this.field_70170_p.func_180495_p(p_175162_1_).func_185915_l() && !this.field_70170_p.func_180495_p(p_175162_1_.func_177984_a()).func_185915_l(); - return !this.field_70170_p.func_180495_p(p_175162_1_).func_185915_l() && !this.field_70170_p.func_180495_p(p_175162_1_.func_177984_a()).func_185915_l();
+ return !this.field_70170_p.func_180495_p(p_175162_1_).func_185915_l(); + IBlockState iblockstate = field_70170_p.func_180495_p(p_175162_1_);
+ return !iblockstate.func_177230_c().isNormalCube(iblockstate, field_70170_p, p_175162_1_);
} }
public void func_70031_b(boolean p_70031_1_) public void func_70031_b(boolean p_70031_1_)
@@ -543,7 +556,13 @@ @@ -543,7 +557,13 @@
public void func_184185_a(SoundEvent p_184185_1_, float p_184185_2_, float p_184185_3_) public void func_184185_a(SoundEvent p_184185_1_, float p_184185_2_, float p_184185_3_)
{ {