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

@@ -5399,7 +5399,7 @@ index 3d85501791fce621335f34bf508becb74b80210d..1370d2d8568a4ed62f2ec3d54abc7d2b
PiglinBruteAI.b(this);
PiglinBruteAI.c(this);
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 fd25524e36317f69091150a85b5068fb6bcf189a..a9a2caadca0f93438a4ad8e21d2e5ff5a98aa3fd 100644
index f2c4d2610ad10dc4fdaf7178e8cee56bfa06acfc..59215aaaa7237c39c9049aa5d106d83d1a65e392 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -32,6 +32,7 @@ import net.minecraft.network.syncher.DataWatcherObject;