Fix milk bucket curing effects before advancement trigger (#170)

neoforged · Nov 10, 2023 · ef633ca · ef633ca
1 parent 97ae536
commit ef633ca
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/patches/net/minecraft/world/item/MilkBucketItem.java.patch b/patches/net/minecraft/world/item/MilkBucketItem.java.patch
@@ -1,14 +1,12 @@
 --- a/net/minecraft/world/item/MilkBucketItem.java
 +++ b/net/minecraft/world/item/MilkBucketItem.java
-@@ -18,6 +_,7 @@
-
-    @Override
-    public ItemStack finishUsingItem(ItemStack p_42923_, Level p_42924_, LivingEntity p_42925_) {
-+      if (!p_42924_.isClientSide) p_42925_.curePotionEffects(p_42923_); // FORGE - move up so stack.shrink does not turn stack into air
-       if (p_42925_ instanceof ServerPlayer serverplayer) {
+@@ -22,15 +_,12 @@
           CriteriaTriggers.CONSUME_ITEM.trigger(serverplayer, p_42923_);
           serverplayer.awardStat(Stats.ITEM_USED.get(this));
-@@ -27,10 +_,6 @@
+       }
++      if (!p_42924_.isClientSide) p_42925_.curePotionEffects(p_42923_); // FORGE - move up so stack.shrink does not turn stack into air
+
+       if (p_42925_ instanceof Player && !((Player)p_42925_).getAbilities().instabuild) {
           p_42923_.shrink(1);
        }