fixed: milk bucket effect curing was triggered before advancement tri…

…gger
cech12 · Nov 4, 2023 · 64eee89 · 64eee89
1 parent b8eec65
commit 64eee89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ## [1.20.2-2.4.0.3] - 2023-11-04
 ### Fixed
 - MobBucketItems with non-bucketable entities were added to creative menu (found in Naturalist mod 4.0)
+- milk bucket effect curing was triggered before advancement trigger (see https://github.com/neoforged/NeoForge/pull/170)
 
 ## [1.20.2-2.4.0.2] - 2023-10-30
 ### Fixed

diff --git a/src/main/java/cech12/bucketlib/api/item/UniversalBucketItem.java b/src/main/java/cech12/bucketlib/api/item/UniversalBucketItem.java
@@ -386,13 +386,13 @@ private <T extends LivingEntity & Bucketable> InteractionResult pickupEntityWith
     @Override
     @Nonnull
     public ItemStack finishUsingItem(@Nonnull ItemStack itemStack, @Nonnull Level level, @Nonnull LivingEntity player) {
-        if (!level.isClientSide) {
-            player.curePotionEffects(new ItemStack(Items.MILK_BUCKET));
-        }
         if (player instanceof ServerPlayer serverPlayer) {
             CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, new ItemStack(Items.MILK_BUCKET));
             serverPlayer.awardStat(Stats.ITEM_USED.get(Items.MILK_BUCKET));
         }
+        if (!level.isClientSide) {
+            player.curePotionEffects(new ItemStack(Items.MILK_BUCKET));
+        }
         if (BucketLibUtil.notCreative(player)) {
             return BucketLibUtil.removeMilk(itemStack);
         }