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

@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ef1c5fc24c2ffd2939e9fc10eb15ef96d5f0a3ca..64580ce8dc1d0be61615a47c2fb3a6b0fecc93e6 100644
index 699afb9759083b42fd0608a3417fd3d17ce8f560..f1e1db97d611192ff2d4b635ef81cf592adde257 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1327,6 +1327,19 @@ public abstract class EntityLiving extends Entity {