ForgePatch/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch

--- ../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)
                     {
Changed the windows setup to use del instead of remove. Both update patches scripts no longer remove svn entries. Added the forge_client\bin and forge_server\bin folders to the svn ignore. 2011-10-10 23:47:30 +00:00			`--- ../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`
First push of server side patch updates for 1.2.3. MLMP is still not updated so it does not include those changes, and will not compile. 2012-03-05 04:46:15 +00:00			`@@ -1,5 +1,7 @@`
			`package net.minecraft.src;`
Fixed a bug in forge_client project that had a hard link to E:/MCP/jars/bin/paul.jar now points to MCP/jars/bin/minecraft.jar {has the same paulsound libraries} Major refactoring of the patches, now each modified file gets its own patch file. Rewrote all the scripts to use new multi-patch system. Added linux install.sh using new system. Added some required libraries from GNUWin32 for the windows side of the new setup.bat/update_patches.bat http://gnuwin32.sourceforge.net/ 2011-10-09 04:21:29 +00:00
			`+import net.minecraft.src.forge.MinecraftForge;`
			`+`
merged with 1.1 branch 2012-01-15 19:16:08 +00:00			`public class ItemBucket extends Item`
			`{`
First push of server side patch updates for 1.2.3. MLMP is still not updated so it does not include those changes, and will not compile. 2012-03-05 04:46:15 +00:00			`/** field for checking if the bucket has been filled. */`
			`@@ -43,10 +45,16 @@`

			`if (this.isFull == 0)`
Fixed a bug in forge_client project that had a hard link to E:/MCP/jars/bin/paul.jar now points to MCP/jars/bin/minecraft.jar {has the same paulsound libraries} Major refactoring of the patches, now each modified file gets its own patch file. Rewrote all the scripts to use new multi-patch system. Added linux install.sh using new system. Added some required libraries from GNUWin32 for the windows side of the new setup.bat/update_patches.bat http://gnuwin32.sourceforge.net/ 2011-10-09 04:21:29 +00:00			`{`
First push of server side patch updates for 1.2.3. MLMP is still not updated so it does not include those changes, and will not compile. 2012-03-05 04:46:15 +00:00			`- 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)`
			`{`