OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 07:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix curing villager makes equipment disappear

Browse source
This commit is contained in:
BillyGalbreath 2020-12-08 22:21:54 -06:00 committed by MiniDigger
parent cc04948176
commit 31ac45a0a2
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Spigot-Server-Patches/0614-Fix-curing-villager-makes-equipment-disappear.patch Normal file
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 a5214914a1dd5effe249e6b9372d7ecf441ee1e1..e021c43b43839c00f81a01bfbec59c546d61ba50 100644
--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -180,7 +180,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
}
}
}