From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Tue, 8 Dec 2020 22:06:56 -0600
Subject: [PATCH] Fix curing villager makes equipment disappear

This fixes the CB bug where curing a villager that is holding
equipment (weapons/armor) causes the items to disappear instead of drop
to the ground by forcing the items to drop instead of going to the drops
field for the EntityDeathEvent which does not fire for entity conversions.

diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/EntityZombieVillager.java
index e137b1e17edd05d244a9d520bb4435f17d8c7daa..c03f4655dcca3d9635a7e13244b7977425a3f291 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntityZombieVillager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityZombieVillager.java
@@ -222,7 +222,9 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
                     double d0 = (double) this.e(enumitemslot);
 
                     if (d0 > 1.0D) {
+                        this.forceDrops = true; // Paper - fix SPIGOT-6207
                         this.a(itemstack);
+                        this.forceDrops = false; // Paper - fix SPIGOT-6207
                     }
                 }
             }