Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-21 23:11:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix wolf armor not dropping from use of shears

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2024-07-04 07:13:33 +10:00
parent 7288f31c8d
commit 3c20906a6b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/nms-patches/net/minecraft/world/entity/animal/EntityWolf.patch
View File

@ -69,7 +69,17 @@
return EnumInteractionResult.sidedSuccess(this.level().isClientSide()); return EnumInteractionResult.sidedSuccess(this.level().isClientSide());
} else { } else {
if (item instanceof ItemDye) { if (item instanceof ItemDye) {
@@ -480,7 +491,7 @@ @@ -463,7 +474,9 @@
this.playSound(SoundEffects.ARMOR_UNEQUIP_WOLF);
itemstack1 = this.getBodyArmorItem();
this.setBodyArmorItem(ItemStack.EMPTY);
+ this.forceDrops = true; // CraftBukkit
this.spawnAtLocation(itemstack1);
+ this.forceDrops = false; // CraftBukkit
return EnumInteractionResult.SUCCESS;
} else if (((RecipeItemStack) ((ArmorMaterial) EnumArmorMaterial.ARMADILLO.value()).repairIngredient().get()).test(itemstack) && this.isInSittingPose() && this.hasArmor() && this.isOwnedBy(entityhuman) && this.getBodyArmorItem().isDamaged()) {
itemstack.shrink(1);
@@ -480,7 +493,7 @@
this.setOrderedToSit(!this.isOrderedToSit()); this.setOrderedToSit(!this.isOrderedToSit());
this.jumping = false; this.jumping = false;
this.navigation.stop(); this.navigation.stop();
@ -78,7 +88,7 @@
return EnumInteractionResult.SUCCESS_NO_ITEM_USED; return EnumInteractionResult.SUCCESS_NO_ITEM_USED;
} else { } else {
return enuminteractionresult; return enuminteractionresult;
@@ -498,7 +509,8 @@ @@ -498,7 +511,8 @@
} }
private void tryToTame(EntityHuman entityhuman) { private void tryToTame(EntityHuman entityhuman) {