Updated Upstream (Bukkit/CraftBukkit/Spigot)

This commit is contained in:
Jake Potrebic 2021-12-31 19:05:42 -08:00 committed by GitHub
parent 8b1734123e
commit 3a43821c38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
859 changed files with 561 additions and 656 deletions

View file

@ -40,10 +40,10 @@ index 20cfdba68c200e87d00995a6a4e25a5fa8171f6c..05ca012854100013714e3d6e8803a295
if (t0 != null) {
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 8d76fe0154f31445a889dfe4cca716cb658053f6..55e4e7fcefc60e66239035e72ad44e0c796bf300 100644
index bd073ac603be130e649d206992c01860ee72d531..6600272bfd5e5ae1699485b143a49a2471c561d9 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -990,6 +990,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -995,6 +995,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
BlockPos blockposition1 = this.findSpawnPositionForGolemInColumn(blockposition, d0, d1);
if (blockposition1 != null) {