Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
e403d6aaf [Auto] Updated Upstream (CraftBukkit)
6bcd8b57c Updated Upstream (CraftBukkit) (#5742)
501cc9448 Reset villager inventory on cancelled pickup event (#5738)
3f72a549b Exit with non-zero exit code when killed by watchdog (#5732)
This commit is contained in:
BillyGalbreath
2021-05-29 08:55:01 -05:00
parent 4c2d7e5651
commit 687936be57
23 changed files with 52 additions and 94 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager brain ticks
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 d74ba20808d42acd10c3861b5314afd45fddb438..4c2b01774403211bf9af8b5c9f75bfa1b30e1746 100644
index 61eaa3e8f961a30e2dc9ae8701ba3b875176e7e0..891f0ab9d66454f0b9456ecb1f2ab36b9562d236 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -127,6 +127,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation