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

Merge pull request #2618 from Thutmose/patch-1

Browse source 
Allow players sized smaller than 1 block to walk into small spaces
This commit is contained in:
LexManos 2016-03-21 17:15:26 -07:00
commit 1830d6de89
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
View file

@ -8,7 +8,7 @@
+ { + {
+ for (int y = 0; y < height; y++) + for (int y = 0; y < height; y++)
+ { + {
+ if (func_175162_d(pos.func_177982_a(0, y, 0))) return false; + if (!func_175162_d(pos.func_177982_a(0, y, 0))) return false;
+ } + }
+ return true; + return true;
+ } + }
@ -21,7 +21,7 @@
double d1 = p_145771_5_ - (double)blockpos.func_177952_p(); double d1 = p_145771_5_ - (double)blockpos.func_177952_p();
- if (!this.func_175162_d(blockpos)) - if (!this.func_175162_d(blockpos))
+ int entHeight = Math.max(Math.round(this.field_70131_O), 1); + int entHeight = Math.max((int)Math.ceil(this.field_70131_O), 1);
+ +
+ boolean inTranslucentBlock = this.isHeadspaceFree(blockpos, entHeight); + boolean inTranslucentBlock = this.isHeadspaceFree(blockpos, entHeight);
+ +
@ -56,6 +56,15 @@
{ {
d2 = 1.0D - d1; d2 = 1.0D - d1;
i = 5; i = 5;
@@ -470,7 +483,7 @@
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();
}
public void func_70031_b(boolean p_70031_1_)
@@ -515,7 +528,13 @@ @@ -515,7 +528,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_)