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

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
parent 75a40177ec 8ffd66f27f
commit f13ed01532
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
forge/forge_common/net/minecraft/src/forge/ForgeHooks.java
View File

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