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

@@ -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 0c37f2cb72438b2b0114a231a7766ecdc8ac3064..e042af3f78a25587ba14d5fd9e346805dd5f1e85 100644
index 1b078f259ccfe480f688d9724bb0a2b4e672eec6..aefa40a09015e243664a531dbf31c6b1ff1d00e7 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