Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
e4633ca27 [Auto] Updated Upstream (Bukkit/CraftBukkit)
a23be44da [Auto] Updated Upstream (CraftBukkit)
e40ea889d [CI-SKIP] Deprecate the view distance APIs on Player (#4945)
d9fd54e16 Do not crash from invalid ingredient lists in VillagerAcquireTradeEvent
24388381a Fix lead duplication

Tuinity Changes:
09423b6 Update to Starlight 0.0.2-RC3
f06591a Update Upstream (Paper)
d2aa70f Revert special block lookup for chunksection
This commit is contained in:
BillyGalbreath
2020-12-28 01:21:49 -06:00
parent 7152b72d25
commit 3d455ff2d5
41 changed files with 2405 additions and 1221 deletions

View File

@@ -42,7 +42,7 @@ index bdfdb73bc1305d3fbda2e0ebe8163bf43b8aede5..ab97d076c921e1fd3ba69ed4b93d43e9
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index bed00077205d3c2d7b2eb67db5af86ddc5346cc2..a1069b64b3af02cbd5d2808275c09d7680c7c1c6 100644
index c402803a364908b854efdb5777f355ac5fee51a4..9eceeb44b19533d80f591850ab496b24b3605a4b 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -332,7 +332,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {