Updated Upstream (CraftBukkit) (#5484)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
6b8cd9a7 SPIGOT-6207: forcibly drop the items of a converted zombie villager

Spigot-Server-Patches/Fix-curing-villager-makes-equipment-disappear.patch

@@ -1,24 +0,0 @@
-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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EntityZombieVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/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
-                     }
-                 }
-             }