diff --git a/patches/common/net/minecraft/src/ItemBucket.java.patch b/patches/common/net/minecraft/src/ItemBucket.java.patch
index 4b33a0c21..4da9c72b6 100644
--- a/patches/common/net/minecraft/src/ItemBucket.java.patch
+++ b/patches/common/net/minecraft/src/ItemBucket.java.patch
@@ -8,7 +8,7 @@
  
  public class ItemBucket extends Item
  {
-@@ -31,6 +34,17 @@
+@@ -31,6 +34,32 @@
          }
          else
          {
@@ -20,7 +20,22 @@
 +
 +            if (event.isHandeled())
 +            {
-+                return event.result;
++                if (par3EntityPlayer.capabilities.isCreativeMode)
++                {
++                    return par1ItemStack;
++                }
++
++                if (--par1ItemStack.stackSize <= 0)
++                {
++                    return event.result;
++                }
++
++                if (!par3EntityPlayer.inventory.addItemStackToInventory(event.result))
++                {
++                    par3EntityPlayer.dropPlayerItem(event.result);
++                }
++
++                return par1ItemStack;
 +            }
 +
              if (var12.typeOfHit == EnumMovingObjectType.TILE)