From f51bdcf978a4f50564b029b6b236612d6857340f Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 4 May 2024 22:48:06 -0700
Subject: [PATCH] fix shear drops for wolf and bogged

Fixes #10661
---
 patches/server/Add-drops-to-shear-events.patch     |  6 +++++-
 patches/server/Add-missing-forceDrop-toggles.patch | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/patches/server/Add-drops-to-shear-events.patch b/patches/server/Add-drops-to-shear-events.patch
index 53ab26e5e3..097b90ee47 100644
--- a/patches/server/Add-drops-to-shear-events.patch
+++ b/patches/server/Add-drops-to-shear-events.patch
@@ -241,7 +241,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      private void spawnShearedMushrooms() {
 +        // Paper start - shear drops API
-+        this.generateShearedMushrooms(this::spawnAtLocation);
++        this.generateShearedMushrooms(stack -> {
++            this.forceDrops = true;
++            this.spawnAtLocation(stack);
++            this.forceDrops = false;
++        });
 +    }
 +    private void generateShearedMushrooms(java.util.function.Consumer<ItemStack> stackConsumer) {
 +        // Paper end - shear drops API
diff --git a/patches/server/Add-missing-forceDrop-toggles.patch b/patches/server/Add-missing-forceDrop-toggles.patch
index f939302057..3ee3c929f5 100644
--- a/patches/server/Add-missing-forceDrop-toggles.patch
+++ b/patches/server/Add-missing-forceDrop-toggles.patch
@@ -56,6 +56,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  Panda.this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
                  int i = Panda.this.isLazy() ? Panda.this.random.nextInt(50) + 10 : Panda.this.random.nextInt(150) + 10;
  
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+@@ -0,0 +0,0 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
+                         this.playSound(SoundEvents.ARMOR_UNEQUIP_WOLF);
+                         itemstack1 = this.getBodyArmorItem();
+                         this.setBodyArmorItem(ItemStack.EMPTY);
++                        this.forceDrops = true; // Paper - add missing forceDrops toggles
+                         this.spawnAtLocation(itemstack1);
++                        this.forceDrops = false; // Paper - add missing forceDrops toggles
+                         return InteractionResult.SUCCESS;
+                     } else if (((Ingredient) ((ArmorMaterial) ArmorMaterials.ARMADILLO.value()).repairIngredient().get()).test(itemstack) && this.isInSittingPose() && this.hasArmor() && this.isOwnedBy(player) && this.getBodyArmorItem().isDamaged()) {
+                         itemstack.shrink(1);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java