diff options
| author | Jake Potrebic <[email protected]> | 2024-05-04 22:48:06 -0700 |
|---|---|---|
| committer | Jake Potrebic <[email protected]> | 2024-05-04 22:48:10 -0700 |
| commit | 7401313e16a03156f1ab09fc5eeee44ae431692a (patch) | |
| tree | 248b994e500af2bda813a10ce61a19893b76e3cf /patches/server/0582-Add-missing-forceDrop-toggles.patch | |
| parent | 6fcca46674f7ebbc261bd63339fbdcba21ab5133 (diff) | |
| download | Paper-7401313e16a03156f1ab09fc5eeee44ae431692a.tar.gz Paper-7401313e16a03156f1ab09fc5eeee44ae431692a.zip | |
fix shear drops for wolf and bogged
Fixes #10661
Diffstat (limited to 'patches/server/0582-Add-missing-forceDrop-toggles.patch')
| -rw-r--r-- | patches/server/0582-Add-missing-forceDrop-toggles.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/patches/server/0582-Add-missing-forceDrop-toggles.patch b/patches/server/0582-Add-missing-forceDrop-toggles.patch index 951b6714fa..b89de7428a 100644 --- a/patches/server/0582-Add-missing-forceDrop-toggles.patch +++ b/patches/server/0582-Add-missing-forceDrop-toggles.patch @@ -56,6 +56,20 @@ index fb4c7220c4edad54813036d62db7e3eefeda92a3..83d8a09980c4ab3c7c97b07c3dcdb3d7 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 11f4a2e15d42a029406fe8399b8d93ae136f0295..5ebf49a565af4ab3bead60a83bca2e6561e6a29c 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java ++++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java +@@ -468,7 +468,9 @@ 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 e1f2425ae6d3737302f6a7e010b172a62b41a018..20d9690127aed9c8ae2632bcf497ba0e473b7bea 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java |