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

Fix blocks being harvested with incorrect tools.

This commit is contained in:
LexManos 2020-06-26 15:40:05 -07:00
parent 97d4652f5f
commit fc6b38d7f2
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minecraftforge/common/ForgeHooks.java
View File

@ -166,23 +166,17 @@ public class ForgeHooks
public static boolean canHarvestBlock(@Nonnull BlockState state, @Nonnull PlayerEntity player, @Nonnull IBlockReader world, @Nonnull BlockPos pos)
{
//state = state.getActualState(world, pos);
if (state.func_235783_q_())
{
if (!state.func_235783_q_())
return true;
}
ItemStack stack = player.getHeldItemMainhand();
ToolType tool = state.getHarvestTool();
if (stack.isEmpty() || tool == null)
{
return true; // TODO: player.canHarvestBlock(state);
}
return player.func_234569_d_(state);
int toolLevel = stack.getItem().getHarvestLevel(stack, tool, player, state);
if (toolLevel < 0)
{
return true; //TODO: player.canHarvestBlock(state);
}
return player.func_234569_d_(state);
return ForgeEventFactory.doPlayerHarvestCheck(player, state, toolLevel >= state.getHarvestLevel());
}