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

Merge pull request #571 from odininon/master 

Addition: ItemStack sensitive canHarvestBlock
This commit is contained in:
LexManos 2013-05-13 21:22:39 -07:00
parent 348add87b3 c5b64c5eef
commit ed5dc83c81
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patches/minecraft/net/minecraft/item/Item.java.patch
View File

@ -60,7 +60,7 @@
Vec3 vec31 = vec3.addVector((double)f7 * d3, (double)f6 * d3, (double)f8 * d3);
return par1World.rayTraceBlocks_do_do(vec3, vec31, par3, !par3);
}
@@ -720,4 +736,497 @@
@@ -720,4 +736,508 @@
{
StatList.initStats();
}
@ -556,5 +556,16 @@
+ {
+ stack.itemDamage = 0;
+ }
+ }
+
+ /**
+ * ItemStack sensitive version of {@link #canHarvestBlock(Block)}
+ * @param par1Block The block trying to harvest
+ * @param itemStack The itemstack used to harvest the block
+ * @return true if can harvest the block
+ */
+ public boolean canHarvestBlock(Block par1Block, ItemStack itemStack)
+ {
+ return canHarvestBlock(par1Block);
+ }
}

9
patches/minecraft/net/minecraft/item/ItemStack.java.patch
View File

@ -59,3 +59,12 @@
}
/**
@@ -396,7 +391,7 @@
*/
public boolean canHarvestBlock(Block par1Block)
{
- return Item.itemsList[this.itemID].canHarvestBlock(par1Block);
+ return Item.itemsList[this.itemID].canHarvestBlock(par1Block, this);
}
public boolean interactWith(EntityLiving par1EntityLiving)