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

---
 ...g-villager-makes-equipment-disappear.patch | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 Spigot-Server-Patches/Fix-curing-villager-makes-equipment-disappear.patch

diff --git a/Spigot-Server-Patches/Fix-curing-villager-makes-equipment-disappear.patch b/Spigot-Server-Patches/Fix-curing-villager-makes-equipment-disappear.patch
new file mode 100644
index 0000000000..0b27f1144f
--- /dev/null
+++ b/Spigot-Server-Patches/Fix-curing-villager-makes-equipment-disappear.patch
@@ -0,0 +1,24 @@
+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/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
++++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
+@@ -0,0 +0,0 @@ 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
+                     }
+                 }
+             }