Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4d111a3 Un-experimentalize Entity TP APIs (#9964)
PaperMC/Paper@2182d47 Update mapping-io (#9975)
PaperMC/Paper@9993eb9 Updates documentation in EntityEquipment.java (#9992)
PaperMC/Paper@2184fbc Log correct recipes and advancement count on server start (#9978)
PaperMC/Paper@8bda1f7 Remove unnecessary durability check in ItemStack#isSimilar (#9979)
PaperMC/Paper@977a729 [ci skip] Correct Windows requiring path to gradlew (#9976)
PaperMC/Paper@3766afa [ci skip] Add mention of FQ imports (#9994)
PaperMC/Paper@40872ec Fix CraftMetaItem#addAttributeModifier duplication check (#9995)
PaperMC/Paper@ffa4115 Configurable Dry and Wet Farmland Tick Rates (#9968)
PaperMC/Paper@37bee09 Restore vanilla entity drops behavior (#7650)
PaperMC/Paper@5cbd535 Fix Mushroom cow stew api (#9934)
PaperMC/Paper@8e061ce Add Structure check API (#9062)
PaperMC/Paper@9271ee7 Dont resend blocks on interactions (#9413)
PaperMC/Paper@931781c [ci skip] rebuild patches
This commit is contained in:
granny
2023-12-06 16:18:27 -08:00
parent c46cb7ef66
commit 4f12f5d3d0
48 changed files with 157 additions and 157 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Customizable sleeping actionbar messages
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 4edea5ea0964bc054b76b1c6635c5b719721e202..f7d9398c9a73c8a02a2515b9d43b49433e5f883c 100644
index 81c7fc2cb4c49745b45ecaaa20d91bab457272d5..331985ee26b9491b7ff71c6a104fafd08f983554 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1219,11 +1219,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -38,10 +38,10 @@ index 4edea5ea0964bc054b76b1c6635c5b719721e202..f7d9398c9a73c8a02a2515b9d43b4943
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 04394c0b122d646ce35c259de41f97e93461955f..4cc1604114ce283a70fb8faf89ac2b3979b06b52 100644
index 934838dc695b708d0672d787887726587dc5762c..f149c4149bf3c19e87c15cbea0078c95283a4d84 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1466,7 +1466,19 @@ public class ServerPlayer extends Player {
@@ -1464,7 +1464,19 @@ public class ServerPlayer extends Player {
});
if (!this.serverLevel().canSleepThroughNights()) {