b8a84f2c29
Both update patches scripts no longer remove svn entries. Added the forge_client\bin and forge_server\bin folders to the svn ignore.
24 lines
892 B
Diff
24 lines
892 B
Diff
--- ../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
|
|
@@ -6,6 +6,8 @@
|
|
|
|
import java.util.Random;
|
|
|
|
+import net.minecraft.src.forge.MinecraftForge;
|
|
+
|
|
// Referenced classes of package net.minecraft.src:
|
|
// Item, EntityPlayer, Vec3D, MathHelper,
|
|
// World, MovingObjectPosition, EnumMovingObjectType, Material,
|
|
@@ -56,6 +58,12 @@
|
|
}
|
|
if(isFull == 0)
|
|
{
|
|
+ ItemStack customBucket = MinecraftForge.fillCustomBucket(world,
|
|
+ i, j, k);
|
|
+ if (customBucket != null) {
|
|
+ return customBucket;
|
|
+ }
|
|
+
|
|
if(!entityplayer.func_35200_c(i, j, k))
|
|
{
|
|
return itemstack;
|