Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b327e17 Fix regenerate chunk method
PaperMC/Paper@22ac7d6 Add internal netty pipeline events
PaperMC/Paper@345a6a6 Updated Upstream (CraftBukkit)
PaperMC/Paper@86f87ba Fix custom merchant trade event world reference
This commit is contained in:
BillyGalbreath
2022-07-27 03:22:54 -05:00
parent a247b93571
commit 85f63e5df0
17 changed files with 53 additions and 53 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 5d10e3f3990de7b3667de02cb515039bfbb6d815..d732880ebed379bf6417bc59735093de010119a6 100644
index 1d256fa287334a9316b0caf8750a749e82797294..880dbd0d1e2aaacbbc160e55ea51e92c8f1fb647 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1341,7 +1341,7 @@ public class ServerPlayer extends Player {
@@ -1342,7 +1342,7 @@ public class ServerPlayer extends Player {
return entitymonster.isPreventingPlayerRest(this);
});