Skip to content

Prevent shearing villager display items #14356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lynxplay merged 1 commit into from
Oct 6, 2026
Merged

Prevent shearing villager display items #14356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions paper-server/patches/sources/net/minecraft/world/entity/Mob.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,15 @@
double dropChance = this.dropChances.byEquipment(slot);
if (!current.isEmpty() && Math.max(this.random.nextFloat() - 0.1F, 0.0F) < dropChance) {
this.spawnAtLocation(level, current);
@@ -562,7 +_,7 @@
}

protected boolean canShearEquipment(final Player player) {
- return !this.isVehicle();
+ return !this.isVehicle() && !(this instanceof net.minecraft.world.entity.npc.villager.Villager); // Paper - Prevent shearing villager display items
}

protected boolean attemptToShearEquipment(final Player player, final InteractionHand hand, final ItemStack heldItem) {
@@ -683,28 +_,34 @@

@Override
Expand Down
9 changes: 8 additions & 1 deletion paper-server/patches/sources/net/minecraft/world/entity/monster/zombie/Zombie.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
}

@Override
@@ -231,6 +_,12 @@
@@ -231,6 +_,19 @@

@VisibleForTesting
public boolean convertVillagerToZombieVillager(final ServerLevel level, final Villager villager) {
Expand All @@ -82,6 +82,13 @@
+
+ public static @Nullable ZombieVillager convertVillagerToZombieVillager(final ServerLevel level, final Villager villager, final net.minecraft.core.BlockPos blockPosition, boolean silent, org.bukkit.event.entity.EntityTransformEvent.TransformReason transformReason, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason creatureSpawnReason) {
+ // CraftBukkit end
+ // Paper start - Clear display items before conversion
+ for (net.minecraft.world.entity.ai.behavior.BehaviorControl<? super Villager> behavior : villager.getBrain().getRunningBehaviors()) {
+ if (behavior instanceof net.minecraft.world.entity.ai.behavior.ShowTradesToPlayer) {
+ behavior.doStop(level, villager, level.getGameTime());
+ }
+ }
+ // Paper end - Clear display items before conversion
ZombieVillager zombieVillager = villager.convertTo(
EntityTypes.ZOMBIE_VILLAGER,
ConversionParams.single(villager, true, true),
Expand Down
Loading