Updated Upstream (Paper, Tuinity & Airplane)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
b94a99b03 Updated Upstream (CraftBukkit) (#5762)
f5cb169e0 [Auto] Updated Upstream (CraftBukkit)

Tuinity Changes:
3eda860f4 Updated Upstream (Paper)
e9c834821 Revert entity ticking chunk map for tracker

Airplane Changes:
3e07ea8cf Patch container checks for WildChests compat
d04adc933 Updated Upstream (Tuinity)
489bb761c Update gradle
0d5670e62 Merge pull request #24 from HexedHero/spelling-mistake-lightning
c605be6dc Fix typo
This commit is contained in:
Ben Kerllenevich
2021-06-01 17:40:11 -04:00
parent 2b35782c51
commit d2204a3dac
17 changed files with 337 additions and 1200 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 cff05a084becc915d723adde122024909d39a5eb..02fb339300669a2b3f702a67085dae3dae2f9908 100644
index ce7506cd71a66ef0b4b332cfb9d755f1a9d2af89..bec501f1f9e8fcb4c2d6186b35912f9113a33f3a 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -979,6 +979,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -977,6 +977,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Nullable
private EntityIronGolem d(WorldServer worldserver) {