From 6fe21994e015fde4808dc9f844c86b1fef8cdb44 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 1 Jun 2021 22:17:16 -0500 Subject: [PATCH] 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) --- Paper | 2 +- patches/server/0002-Airplane-Server-Changes.patch | 2 +- patches/server/0019-Configurable-villager-brain-ticks.patch | 2 +- patches/server/0062-Villagers-follow-emerald-blocks.patch | 2 +- patches/server/0063-Allow-leashing-villagers.patch | 2 +- ...Implement-configurable-search-radius-for-villagers-t.patch | 4 ++-- patches/server/0091-Configurable-villager-breeding.patch | 2 +- patches/server/0103-Ridables.patch | 2 +- patches/server/0144-Lobotomize-stuck-villagers.patch | 2 +- ...0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch | 4 ++-- patches/server/0150-Configurable-entity-base-attributes.patch | 2 +- patches/server/0187-Add-config-for-villager-trading.patch | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Paper b/Paper index b94a99b03..ea381dde3 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit b94a99b0337823efb2863243deeb8701c3ff781e +Subproject commit ea381dde3241749260461fe5811b200b1b037afc diff --git a/patches/server/0002-Airplane-Server-Changes.patch b/patches/server/0002-Airplane-Server-Changes.patch index 325881e9f..dcbf8c041 100644 --- a/patches/server/0002-Airplane-Server-Changes.patch +++ b/patches/server/0002-Airplane-Server-Changes.patch @@ -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 diff --git a/patches/server/0019-Configurable-villager-brain-ticks.patch b/patches/server/0019-Configurable-villager-brain-ticks.patch index 7e4955b04..5ff8ed89c 100644 --- a/patches/server/0019-Configurable-villager-brain-ticks.patch +++ b/patches/server/0019-Configurable-villager-brain-ticks.patch @@ -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 75c3239c9869863d9653916f3656c882b798cf07..f08e7accaa012b1fc8a55176a69738722965319d 100644 +index ccb568a5e8501ac5e8901ef3a270cc87471d9ea1..7a404996909454d1d6bc606609f0c19853cda91a 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 diff --git a/patches/server/0062-Villagers-follow-emerald-blocks.patch b/patches/server/0062-Villagers-follow-emerald-blocks.patch index 4a09222cd..58d4293c0 100644 --- a/patches/server/0062-Villagers-follow-emerald-blocks.patch +++ b/patches/server/0062-Villagers-follow-emerald-blocks.patch @@ -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; diff --git a/patches/server/0063-Allow-leashing-villagers.patch b/patches/server/0063-Allow-leashing-villagers.patch index e79a91f63..826bee254 100644 --- a/patches/server/0063-Allow-leashing-villagers.patch +++ b/patches/server/0063-Allow-leashing-villagers.patch @@ -25,7 +25,7 @@ index 5327867d6beb97153b7b0744e99c2ad48e9c4bb4..091bc957ed810bc6f5c7e380af8e85b6 // Paper start - drop leash variable PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman, !entityhuman.abilities.canInstantlyBuild); 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 3dab7416dfba200acd69d87886088777a998a194..ce7506cd71a66ef0b4b332cfb9d755f1a9d2af89 100644 +index 36d61ee7dd95d24d4220c1129b4a3edec7459375..61e099680f8caf59e0a0d0d01fb0765cd033b494 100644 --- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java +++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java @@ -149,6 +149,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation diff --git a/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch index 38bde41a0..55173c4e9 100644 --- a/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch @@ -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) { diff --git a/patches/server/0091-Configurable-villager-breeding.patch b/patches/server/0091-Configurable-villager-breeding.patch index a573d222a..237550f1f 100644 --- a/patches/server/0091-Configurable-villager-breeding.patch +++ b/patches/server/0091-Configurable-villager-breeding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager breeding 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 bec501f1f9e8fcb4c2d6186b35912f9113a33f3a..fd25524e36317f69091150a85b5068fb6bcf189a 100644 +index 31372fe2a7cfdc416594c943b7e771ba3aedf771..f2c4d2610ad10dc4fdaf7178e8cee56bfa06acfc 100644 --- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java +++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java @@ -718,7 +718,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation diff --git a/patches/server/0103-Ridables.patch b/patches/server/0103-Ridables.patch index 4bd8d404a..87f692970 100644 --- a/patches/server/0103-Ridables.patch +++ b/patches/server/0103-Ridables.patch @@ -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; diff --git a/patches/server/0144-Lobotomize-stuck-villagers.patch b/patches/server/0144-Lobotomize-stuck-villagers.patch index 0dcc26c1e..7533a626c 100644 --- a/patches/server/0144-Lobotomize-stuck-villagers.patch +++ b/patches/server/0144-Lobotomize-stuck-villagers.patch @@ -30,7 +30,7 @@ index 48e6a4c588ef39a4bde067d79b96a656c68750ce..ac7bad10697c6fde7d512753992d5971 // Paper start - add target parameter return this.a(blockposition, null, i); 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 a9a2caadca0f93438a4ad8e21d2e5ff5a98aa3fd..539a338081bd532779b7f6ec15cc91ab5bd1cca9 100644 +index 59215aaaa7237c39c9049aa5d106d83d1a65e392..53cc18543c113efba90df126b3a5a9931954c4d7 100644 --- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java +++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java @@ -89,6 +89,7 @@ import net.minecraft.world.level.IWorldReader; diff --git a/patches/server/0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index 27cde5240..4c9415a4c 100644 --- a/patches/server/0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -186,7 +186,7 @@ index 25c10973c74f98224dd1d2ae5e7178b9781374aa..d50b5632f0e53147ea23109f1ed627b4 behaviorcontroller.removeMemory(MemoryModuleType.SECONDARY_JOB_SITE); } 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 539a338081bd532779b7f6ec15cc91ab5bd1cca9..56f45267919c8c7722f1cde29a4ac18c7f5f1069 100644 +index 53cc18543c113efba90df126b3a5a9931954c4d7..ff08528debe1ce89e36b5daa1c9b0ba07b6ecff3 100644 --- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java +++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java @@ -203,7 +203,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -198,7 +198,7 @@ index 539a338081bd532779b7f6ec15cc91ab5bd1cca9..56f45267919c8c7722f1cde29a4ac18c } behaviorcontroller.a(Activity.CORE, Behaviors.a(villagerprofession, 0.5F)); -@@ -951,6 +951,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation +@@ -955,6 +955,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation } public boolean canPlant() { diff --git a/patches/server/0150-Configurable-entity-base-attributes.patch b/patches/server/0150-Configurable-entity-base-attributes.patch index 92b7a5b66..6c296d81c 100644 --- a/patches/server/0150-Configurable-entity-base-attributes.patch +++ b/patches/server/0150-Configurable-entity-base-attributes.patch @@ -1367,7 +1367,7 @@ index 1370d2d8568a4ed62f2ec3d54abc7d2bebc48f75..201b78ffb5062254a6b3447f217df03d public static AttributeProvider.Builder eS() { 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 56f45267919c8c7722f1cde29a4ac18c7f5f1069..1b078f259ccfe480f688d9724bb0a2b4e672eec6 100644 +index ff08528debe1ce89e36b5daa1c9b0ba07b6ecff3..152b35c35d7ec38800b638fcfe5c80ba61530c13 100644 --- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java +++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java @@ -167,6 +167,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation diff --git a/patches/server/0187-Add-config-for-villager-trading.patch b/patches/server/0187-Add-config-for-villager-trading.patch index ec59bd669..7e7632073 100644 --- a/patches/server/0187-Add-config-for-villager-trading.patch +++ b/patches/server/0187-Add-config-for-villager-trading.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for villager trading 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 1b078f259ccfe480f688d9724bb0a2b4e672eec6..aefa40a09015e243664a531dbf31c6b1ff1d00e7 100644 +index 152b35c35d7ec38800b638fcfe5c80ba61530c13..3db9da2c1691053c35333f7eb3691fea26398ecc 100644 --- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java +++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java @@ -373,7 +373,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation