Merge pull request #51 from ShetiPhian/patch-1

Edits enable use of EntityPlayer.canHarvestBlock (for PlayerAPI)
This commit is contained in:
LexManos 2012-04-17 10:26:55 -07:00
commit f13ed01532
1 changed files with 3 additions and 3 deletions

View File

@ -431,13 +431,13 @@ public class ForgeHooks
ItemStack stack = player.inventory.getCurrentItem();
if (stack == null)
{
return false;
return player.canHarvestBlock(block);
}
List info = (List)toolClasses.get(stack.itemID);
if (info == null)
{
return stack.canHarvestBlock(block);
return player.canHarvestBlock(block);
}
Object[] tmp = info.toArray();
String toolClass = (String)tmp[0];
@ -446,7 +446,7 @@ public class ForgeHooks
Integer blockHarvestLevel = (Integer)toolHarvestLevels.get(Arrays.asList(block.blockID, metadata, toolClass));
if (blockHarvestLevel == null)
{
return stack.canHarvestBlock(block);
return player.canHarvestBlock(block);
}
if (blockHarvestLevel > harvestLevel)
{