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

Player sensitive version of Block.getPickBlock

Browse source 
Block.getPickBlock was patched in 1.7 but was overlooked in 1.8.

Closes: https://github.com/MinecraftForge/MinecraftForge/issues/1709
This commit is contained in:
Timothy Tomkins 2015-04-09 02:09:58 -04:00
parent 2f5b5f5ffe
commit dfd42ab573
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -161,7 +161,7 @@
} }
protected ItemStack func_180643_i(IBlockState p_180643_1_) protected ItemStack func_180643_i(IBlockState p_180643_1_)
@@ -971,6 +989,1028 @@ @@ -971,6 +989,1033 @@
return Block.EnumOffsetType.NONE; return Block.EnumOffsetType.NONE;
} }
@ -734,6 +734,11 @@
+ * @param target The full target the player is looking at + * @param target The full target the player is looking at
+ * @return A ItemStack to add to the player's inventory, Null if nothing should be added. + * @return A ItemStack to add to the player's inventory, Null if nothing should be added.
+ */ + */
+ public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player)
+ {
+ return getPickBlock(target, world, pos);
+ }
+ @Deprecated
+ public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos) + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos)
+ { + {
+ Item item = func_180665_b(world, pos); + Item item = func_180665_b(world, pos);

2
src/main/java/net/minecraftforge/common/ForgeHooks.java
View file

@ -264,7 +264,7 @@ public class ForgeHooks
if (isCreative && GuiScreen.isCtrlKeyDown()) if (isCreative && GuiScreen.isCtrlKeyDown())
te = world.getTileEntity(target.getBlockPos()); te = world.getTileEntity(target.getBlockPos());
result = state.getBlock().getPickBlock(target, world, target.getBlockPos()); result = state.getBlock().getPickBlock(target, world, target.getBlockPos(), player);
} }
else else
{ {