Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@eb48ada Merge chunk task urgent executor thread into the worker queue
PaperMC/Paper@d9fb602 Expose vanilla BiomeProvider from WorldInfo (#7295)
PaperMC/Paper@7d7ae7b Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7246)
This commit is contained in:
BillyGalbreath
2022-01-09 00:27:01 -06:00
parent 9c51f21c2e
commit e85e5ebc2e
22 changed files with 84 additions and 88 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 2950a9556fd474b659d66c1fc4d5e6e451ad9fda..1bc7b7f016b0f58bad34dfd58e506967d61099e5 100644
index 72341e3907ea19e16b5f09a7e7b38aac73d1ad50..66628b9c301da2fee3afe42ed321a2c31fc63d2b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1520,6 +1520,19 @@ public abstract class LivingEntity extends Entity {
@@ -1519,6 +1519,19 @@ public abstract class LivingEntity extends Entity {
}
}