From 2bdcc3a23af96e71ad40a79498abef88795fe53e Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 16 Dec 2012 18:02:45 -0800 Subject: [PATCH] Remove erronious double call to PlayerDestroyItemEvent --- .../net/minecraft/item/ItemInWorldManager.java.patch | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch b/patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch index 4b06343db..721dde2d9 100644 --- a/patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch @@ -115,11 +115,7 @@ if (var7 != null) { -@@ -275,9 +321,11 @@ - if (var7.stackSize == 0) - { - this.thisPlayerMP.destroyCurrentEquippedItem(); -+ MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thisPlayerMP, var7)); +@@ -278,6 +324,7 @@ } } @@ -127,7 +123,7 @@ if (var6 && var8) { Block.blocksList[var4].harvestBlock(this.theWorld, this.thisPlayerMP, par1, par2, par3, var5); -@@ -318,6 +366,7 @@ +@@ -318,6 +365,7 @@ if (var6.stackSize == 0) { par1EntityPlayer.inventory.mainInventory[par1EntityPlayer.inventory.currentItem] = null; @@ -135,7 +131,7 @@ } if (!par1EntityPlayer.isUsingItem()) -@@ -335,29 +384,56 @@ +@@ -335,29 +383,56 @@ */ public boolean activateBlockOrUseItem(EntityPlayer par1EntityPlayer, World par2World, ItemStack par3ItemStack, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { @@ -214,7 +210,7 @@ } /** -@@ -367,4 +443,13 @@ +@@ -367,4 +442,13 @@ { this.theWorld = par1WorldServer; }