From 49f263eb6307ae2ec3ff23755d7766b5a78717ba Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 27 Sep 2012 23:56:39 -0700 Subject: [PATCH] Fix buckets, need to rethink for bukkit compatibility. --- .../common/net/minecraft/src/ItemInWorldManager.java.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/patches/common/net/minecraft/src/ItemInWorldManager.java.patch b/patches/common/net/minecraft/src/ItemInWorldManager.java.patch index b7a29c2849..3881b2f431 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,54 @@ +@@ -318,29 +366,55 @@ */ public boolean activateBlockOrUseItem(EntityPlayer par1EntityPlayer, World par2World, ItemStack par3ItemStack, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { @@ -202,15 +202,16 @@ + if (par3ItemStack.stackSize <= 0) ForgeEventFactory.onPlayerDestroyItem(thisPlayerMP, par3ItemStack); + } + ++ /* Re-enable if this causes bukkit incompatibility, or re-write client side to only send a single packet per right click. + if (par3ItemStack != null && ((!result && event.useItem != Event.Result.DENY) || event.useItem == Event.Result.ALLOW)) + { + this.tryUseItem(thisPlayerMP, par2World, par3ItemStack); -+ } ++ }*/ + return result; } /** -@@ -350,4 +423,13 @@ +@@ -350,4 +424,13 @@ { this.theWorld = par1WorldServer; }