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

@@ -95,10 +95,10 @@ index a5718af9b614ae505067131f04ebb490617d6aa4..b6b4c8c491d692f93d2c38d602ff99b0
return this.E;
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 9469d6052ad920f9fd9848e7ee55e488372e5e62..e26fc1a6032027d16e72931c8329196b683774ba 100644
index f288bf3f6e521cfde14b08c62d591ad74d2e3153..93f09acd2ca26793bc0771a6cc5419bfa8536816 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -2559,6 +2559,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -2499,6 +2499,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
}