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

Fix NPE when sleeping in some custom beds. Closes #4956

Browse source
This commit is contained in:
LexManos 2018-06-27 12:23:00 -07:00
parent 1007d3e9c5
commit 464cccaa3e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
View file

@ -359,7 +359,8 @@
{
+ net.minecraftforge.event.ForgeEventFactory.onPlayerWakeup(this, p_70999_1_, p_70999_2_, p_70999_3_);
this.func_70105_a(0.6F, 1.8F);
IBlockState iblockstate = this.field_70170_p.func_180495_p(this.field_71081_bT);
- IBlockState iblockstate = this.field_70170_p.func_180495_p(this.field_71081_bT);
+ IBlockState iblockstate = this.field_71081_bT == null ? null : this.field_70170_p.func_180495_p(this.field_71081_bT);
- if (this.field_71081_bT != null && iblockstate.func_177230_c() == Blocks.field_150324_C)
+ if (this.field_71081_bT != null && iblockstate.func_177230_c().isBed(iblockstate, field_70170_p, field_71081_bT, this))