Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
This commit is contained in:
BillyGalbreath
2022-01-23 01:01:36 -06:00
parent f134a20b29
commit 455225ecfc
47 changed files with 206 additions and 215 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Mob head visibility percent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index e44b0c3704ca6b7609f6638e43aa8abe1939bfd8..b23c78fe2ad93a88378af90563e90b963f3f4322 100644
index 0f36cf3ab761d4f920b461054dba8e1dcf55ffc1..6e3cd8c1e0aa87de00824bfc5a06a6bf9cbc907c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -990,9 +990,17 @@ public abstract class LivingEntity extends Entity {
@@ -989,9 +989,17 @@ public abstract class LivingEntity extends Entity {
ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
EntityType<?> entitytypes = entity.getType();
@@ -29,7 +29,7 @@ index e44b0c3704ca6b7609f6638e43aa8abe1939bfd8..b23c78fe2ad93a88378af90563e90b96
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7f438d507807801f4aff13441bf7b14e46ab8a4a..cd900a8022aa23da4ab2a294c74100fc80fb960d 100644
index c7bdfa210836be7a5f5c9956a24f4b791a590f4b..a2b645a13cda2719b361e2cc0473e75e3cfb2383 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1256,6 +1256,7 @@ public class PurpurWorldConfig {