Can't obtain advancements "The Cutest Predator", "Tactical Fishing" or "Bukkit bukkit" in creative mode

Can confirm in 1.18.2.

Can confirm in 22w13a. This also affects the "Bukkit Bukkit" (Catch a tadpole in a bucket) advancement.

Cause:

In creative mode, fish bucket is added into inventory rather than replacing the water bucket.

In ItemUtils.add(ItemStack), the fish bucket is set to empty (as a return value representing the items that needs to be dropped).

However, the advancement criterion is triggered after the fish bucket stack becomes empty, so it can't be triggered correctly.

Code:

In Bucketable::bucketMobPickup,

ItemStack mobBucket = mob.getBucketItemStack();
mob.saveToBucketTag(mobBucket);
ItemStack itemstack2 = ItemUtils.createFilledResult(itemstack, player, mobBucket, false);        //mob bucket becomes empty in this
player.setItemInHand(p_148830_, itemstack2);
Level level = mob.level;
if (!level.isClientSide) {
        CriteriaTriggers.FILLED_BUCKET.trigger((ServerPlayer)player, mobBucket);
}

And BucketItem::use is the same

How to fix:

It's easy to fix: clone the fish bucket so as to avoid it becoming empty:

Code:

In Bucketable::bucketMobPickup,

ItemStack mobBucket = mob.getBucketItemStack();
mob.saveToBucketTag(mobBucket);
ItemStack temp = new ItemStack(mobBucket); // clone the stack
ItemStack itemstack2 = ItemUtils.createFilledResult(itemstack, player, mobBucket, false);        //mob bucket becomes empty in this
player.setItemInHand(p_148830_, itemstack2);
Level level = mob.level;
if (!level.isClientSide) {
        CriteriaTriggers.FILLED_BUCKET.trigger((ServerPlayer)player, temp);
}

And BucketItem::use is the same