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

@@ -5,7 +5,7 @@ Subject: [PATCH] Villagers follow emerald blocks
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 f08e7accaa012b1fc8a55176a69738722965319d..3dab7416dfba200acd69d87886088777a998a194 100644
index 7a404996909454d1d6bc606609f0c19853cda91a..36d61ee7dd95d24d4220c1129b4a3edec7459375 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -59,6 +59,7 @@ import net.minecraft.world.entity.ai.BehaviorController;