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

Merge pull request #2621 from Thutmose/patch-1

Browse source 
Fix pushing players inside blocks.
This commit is contained in:
LexManos 2016-03-21 19:34:58 -07:00
commit 76efd93235
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@
- if (!this.func_175162_d(blockpos)) - if (!this.func_175162_d(blockpos))
+ int entHeight = Math.max((int)Math.ceil(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);
+ +
+ if (inTranslucentBlock) + if (inTranslucentBlock)
{ {
@ -31,28 +31,28 @@
double d2 = 9999.0D; double d2 = 9999.0D;
- if (this.func_175162_d(blockpos.func_177976_e()) && d0 < d2) - if (this.func_175162_d(blockpos.func_177976_e()) && d0 < d2)
+ if (!this.isHeadspaceFree(blockpos.func_177976_e(), entHeight) && d0 < d2) + if (this.isHeadspaceFree(blockpos.func_177976_e(), entHeight) && d0 < d2)
{ {
d2 = d0; d2 = d0;
i = 0; i = 0;
} }
- if (this.func_175162_d(blockpos.func_177974_f()) && 1.0D - d0 < d2) - if (this.func_175162_d(blockpos.func_177974_f()) && 1.0D - d0 < d2)
+ if (!this.isHeadspaceFree(blockpos.func_177974_f(), entHeight) && 1.0D - d0 < d2) + if (this.isHeadspaceFree(blockpos.func_177974_f(), entHeight) && 1.0D - d0 < d2)
{ {
d2 = 1.0D - d0; d2 = 1.0D - d0;
i = 1; i = 1;
} }
- if (this.func_175162_d(blockpos.func_177978_c()) && d1 < d2) - if (this.func_175162_d(blockpos.func_177978_c()) && d1 < d2)
+ if (!this.isHeadspaceFree(blockpos.func_177978_c(), entHeight) && d1 < d2) + if (this.isHeadspaceFree(blockpos.func_177978_c(), entHeight) && d1 < d2)
{ {
d2 = d1; d2 = d1;
i = 4; i = 4;
} }
- if (this.func_175162_d(blockpos.func_177968_d()) && 1.0D - d1 < d2) - if (this.func_175162_d(blockpos.func_177968_d()) && 1.0D - d1 < d2)
+ if (!this.isHeadspaceFree(blockpos.func_177968_d(), entHeight) && 1.0D - d1 < d2) + if (this.isHeadspaceFree(blockpos.func_177968_d(), entHeight) && 1.0D - d1 < d2)
{ {
d2 = 1.0D - d1; d2 = 1.0D - d1;
i = 5; i = 5;