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

Remove erronious double call to PlayerDestroyItemEvent

Browse source
This commit is contained in:
LexManos 2012-12-16 18:02:45 -08:00
parent be6667f733
commit 2bdcc3a23a
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
patches/minecraft/net/minecraft/item/ItemInWorldManager.java.patch
View file

@ -115,11 +115,7 @@
if (var7 != null) if (var7 != null)
{ {
@@ -275,9 +321,11 @@ @@ -278,6 +324,7 @@
if (var7.stackSize == 0)
{
this.thisPlayerMP.destroyCurrentEquippedItem();
+ MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thisPlayerMP, var7));
} }
} }
@ -127,7 +123,7 @@
if (var6 && var8) if (var6 && var8)
{ {
Block.blocksList[var4].harvestBlock(this.theWorld, this.thisPlayerMP, par1, par2, par3, var5); Block.blocksList[var4].harvestBlock(this.theWorld, this.thisPlayerMP, par1, par2, par3, var5);
@@ -318,6 +366,7 @@ @@ -318,6 +365,7 @@
if (var6.stackSize == 0) if (var6.stackSize == 0)
{ {
par1EntityPlayer.inventory.mainInventory[par1EntityPlayer.inventory.currentItem] = null; par1EntityPlayer.inventory.mainInventory[par1EntityPlayer.inventory.currentItem] = null;
@ -135,7 +131,7 @@
} }
if (!par1EntityPlayer.isUsingItem()) 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) 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; this.theWorld = par1WorldServer;
} }