Fix curing villager makes equipment disappear

This commit is contained in:
BillyGalbreath 2020-12-08 22:21:54 -06:00
parent c81621d172
commit 6ce7d63918

View file

@ -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
}
}
}