keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix FillBucketEvent to actually fire.

Browse source
This commit is contained in:
LexManos 2012-08-25 00:30:32 -07:00
parent 8fc05c399a
commit 58fc45619f
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
patches/common/net/minecraft/src/ItemBucket.java.patch
View file

@ -1,35 +1,28 @@
--- ../src_base/common/net/minecraft/src/ItemBucket.java
+++ ../src_work/common/net/minecraft/src/ItemBucket.java
@@ -1,4 +1,6 @@
@@ -1,4 +1,7 @@
package net.minecraft.src;
+
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.FillBucketEvent;
public class ItemBucket extends Item
{
@@ -31,6 +33,17 @@
@@ -31,6 +34,17 @@
}
else
{
+ FillBucketEvent event = new FillBucketEvent(par3EntityPlayer, par1ItemStack, par2World, var12);
+ if (event.isCanceled())
+ if (MinecraftForge.EVENT_BUS.post(event))
+ {
+ return par1ItemStack;
+ }
+
+
+ if (event.isHandeled())
+ {
+ return event.result;
+ }
+
+
if (var12.typeOfHit == EnumMovingObjectType.TILE)
{
int var13 = var12.blockX;
@@ -41,6 +54,7 @@
{
return par1ItemStack;
}
+
if (this.isFull == 0)
{