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

Merge pull request #2634 from mezz/null-pick

Browse source 
Fix Block.getPickBlock returning an ItemStack with a null Item
This commit is contained in:
LexManos 2016-03-30 13:48:02 -07:00
commit 1083984c8a
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,15 +188,20 @@
} }
protected ItemStack func_180643_i(IBlockState p_180643_1_) protected ItemStack func_180643_i(IBlockState p_180643_1_)
@@ -747,6 +767,7 @@ @@ -747,9 +767,11 @@
p_176216_2_.field_70181_x = 0.0D; p_176216_2_.field_70181_x = 0.0D;
} }
+ @Deprecated // Forge: Use more sensitive version below: getPickBlock + @Deprecated // Forge: Use more sensitive version below: getPickBlock
public ItemStack func_185473_a(World p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_) public ItemStack func_185473_a(World p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_)
{ {
return new ItemStack(Item.func_150898_a(this), 1, this.func_180651_a(p_185473_3_)); - return new ItemStack(Item.func_150898_a(this), 1, this.func_180651_a(p_185473_3_));
@@ -844,6 +865,1168 @@ + Item item = Item.func_150898_a(this);
+ return item == null ? null : new ItemStack(item, 1, this.func_180651_a(p_185473_3_));
}
@SideOnly(Side.CLIENT)
@@ -844,6 +866,1168 @@
return "Block{" + field_149771_c.func_177774_c(this) + "}"; return "Block{" + field_149771_c.func_177774_c(this) + "}";
} }