Fix milk not working on anything at all (#3574)

This commit is contained in:
Vincent Lee 2017-01-11 17:19:20 -06:00 committed by LexManos
parent 941c3eff02
commit a824214333
1 changed files with 11 additions and 6 deletions

View File

@ -1,15 +1,20 @@
--- ../src-base/minecraft/net/minecraft/item/ItemBucketMilk.java
+++ ../src-work/minecraft/net/minecraft/item/ItemBucketMilk.java
@@ -27,7 +27,7 @@
@@ -20,11 +20,13 @@
if (!p_77654_2_.field_72995_K)
public ItemStack func_77654_b(ItemStack p_77654_1_, World p_77654_2_, EntityLivingBase p_77654_3_)
{
+ if (!p_77654_2_.field_72995_K) p_77654_3_.curePotionEffects(p_77654_1_); // FORGE - move up so stack.shrink does not turn stack into air
if (p_77654_3_ instanceof EntityPlayer && !((EntityPlayer)p_77654_3_).field_71075_bZ.field_75098_d)
{
- p_77654_3_.func_70674_bp();
+ p_77654_3_.curePotionEffects(p_77654_1_);
p_77654_1_.func_190918_g(1);
}
if (p_77654_3_ instanceof EntityPlayer)
@@ -53,4 +53,9 @@
+ if (false) // FORGE - stack sensitive version at top of method
if (!p_77654_2_.field_72995_K)
{
p_77654_3_.func_70674_bp();
@@ -53,4 +55,9 @@
p_77659_2_.func_184598_c(p_77659_3_);
return new ActionResult(EnumActionResult.SUCCESS, p_77659_2_.func_184586_b(p_77659_3_));
}