Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a622eba Fix beehives generating from using bonemeal (#9052)
PaperMC/Paper@fbf74ba Updated Upstream (CraftBukkit) (#9053)
This commit is contained in:
granny
2023-03-26 23:43:18 -07:00
parent 49d99462fa
commit 7e014a84b5
31 changed files with 99 additions and 99 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index bc2c592a416c64619527bf5d1040f4a2523b2bfb..64dc052f41e0ef96753e0ffd3d6517fc93dc5185 100644
index 5f616eba7aa8c6ece6999e4d45e107a66d822132..8e537c5b3926b6196f6cfd36cead4cb75ea9534a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1386,7 +1386,7 @@ public class ServerPlayer extends Player {
@@ -1387,7 +1387,7 @@ public class ServerPlayer extends Player {
return entitymonster.isPreventingPlayerRest(this);
});
@@ -18,7 +18,7 @@ index bc2c592a416c64619527bf5d1040f4a2523b2bfb..64dc052f41e0ef96753e0ffd3d6517fc
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 966c6c71e52ebb239631c61b40bbb3f4cc63a416..b7cf07d2abde017915d5204ab2f90ff6145e88c8 100644
index d22d0a64c6a744b843105c32ec4b5a141030ec1c..28b209423cddc091fce79b9bfe69b4c63fb8d761 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -357,6 +357,7 @@ public class PurpurWorldConfig {