Skip to content

Commit

Permalink
Revert "Fix milk bucket curing effects before advancement trigger (ne…
Browse files Browse the repository at this point in the history
…oforged#170)"

This reverts commit ef633ca.
  • Loading branch information
Xing-C committed Dec 4, 2023
1 parent 476d92c commit f3d6918
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions patches/net/minecraft/world/item/MilkBucketItem.java.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
--- a/net/minecraft/world/item/MilkBucketItem.java
+++ b/net/minecraft/world/item/MilkBucketItem.java
@@ -22,15 +_,12 @@
@@ -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) {
CriteriaTriggers.CONSUME_ITEM.trigger(serverplayer, p_42923_);
serverplayer.awardStat(Stats.ITEM_USED.get(this));
}
+ 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) {
@@ -27,10 +_,6 @@
p_42923_.shrink(1);
}

Expand Down

0 comments on commit f3d6918

Please sign in to comment.