diff --git a/common/forge_at.cfg b/common/forge_at.cfg index 55f09a92f3..25f6821692 100644 --- a/common/forge_at.cfg +++ b/common/forge_at.cfg @@ -24,6 +24,7 @@ public avb.h # theWorld public avb.i # renderEngine public avb.q # mc public avb.r # globalRenderBlocks +public avb.E # damagedBlocks # SoundManager public ayq.a # sndSystem public ayq.b # soundPoolSounds diff --git a/patches/common/net/minecraft/src/ItemInWorldManager.java.patch b/patches/common/net/minecraft/src/ItemInWorldManager.java.patch index 3881b2f431..5e425f89c2 100644 --- a/patches/common/net/minecraft/src/ItemInWorldManager.java.patch +++ b/patches/common/net/minecraft/src/ItemInWorldManager.java.patch @@ -133,7 +133,7 @@ } return true; -@@ -318,29 +366,55 @@ +@@ -318,29 +366,56 @@ */ public boolean activateBlockOrUseItem(EntityPlayer par1EntityPlayer, World par2World, ItemStack par3ItemStack, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { @@ -147,6 +147,7 @@ + Item item = (par3ItemStack != null ? par3ItemStack.getItem() : null); + if (item != null && item.onItemUseFirst(par3ItemStack, par1EntityPlayer, par2World, par4, par5, par6, par7, par8, par9, par10)) + { ++ if (par3ItemStack.stackSize <= 0) ForgeEventFactory.onPlayerDestroyItem(thisPlayerMP, par3ItemStack); + return true; + } + @@ -211,7 +212,7 @@ } /** -@@ -350,4 +424,13 @@ +@@ -350,4 +425,13 @@ { this.theWorld = par1WorldServer; }