--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java	0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java	0000-00-00 00:00:00.000000000 -0000
@@ -1,5 +1,7 @@
 package net.minecraft.src;
 
+import net.minecraft.src.forge.MinecraftForge;
+
 public class ItemBucket extends Item
 {
     /** field for checking if the bucket has been filled. */
@@ -43,10 +45,16 @@
 
                 if (this.isFull == 0)
                 {
-                    if (!par3EntityPlayer.canPlayerEdit(var13, var14, var15))
+                    if (par3EntityPlayer != null && !par3EntityPlayer.canPlayerEdit(var13, var14, var15))
                     {
                         return par1ItemStack;
                     }
+                    
+                    ItemStack stack = MinecraftForge.fillCustomBucket(par2World, var13, var14, var15);
+                    if (stack != null)
+                    {
+                        return stack;
+                    }
 
                     if (par2World.getBlockMaterial(var13, var14, var15) == Material.water && par2World.getBlockMetadata(var13, var14, var15) == 0)
                     {