Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
ea381dde3 Reset villager inventory on cancelled pickup event (again) (#5766) (Fixes #5765)
This commit is contained in:
BillyGalbreath
2021-06-01 22:17:16 -05:00
parent 5824eb8f2c
commit 6fe21994e0
12 changed files with 14 additions and 14 deletions

View File

@@ -2734,7 +2734,7 @@ index 9a7bebd77302dbfd07ac802acbe2b9cb80eec26f..99cdcc9a9a7e6227a165c4ef779f8e76
}
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index c29f05b6fd0664345d8d09f898777a3e44f866c4..75c3239c9869863d9653916f3656c882b798cf07 100644
index 85374ac8f5460790de03b47d7c3ce19ed5596afe..ccb568a5e8501ac5e8901ef3a270cc87471d9ea1 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -231,11 +231,17 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation