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

@@ -6,10 +6,10 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
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 ce7506cd71a66ef0b4b332cfb9d755f1a9d2af89..bec501f1f9e8fcb4c2d6186b35912f9113a33f3a 100644
index 61e099680f8caf59e0a0d0d01fb0765cd033b494..31372fe2a7cfdc416594c943b7e771ba3aedf771 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -977,6 +977,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -981,6 +981,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Nullable
private EntityIronGolem d(WorldServer worldserver) {