mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 19:07:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@41ab602 [ci skip] couple more fixes for build pr jar label (#8599) PaperMC/Paper@c40f8d5 Sync offhand slot in menus (#7341) PaperMC/Paper@425baed Fully deserialise persistent anger post async load (#8560) PaperMC/Paper@ec6a9a3 Updated Upstream (Bukkit/CraftBukkit) (#8604) PaperMC/Paper@96fdafd Player Entity Tracking Events (#4722) PaperMC/Paper@407a445 Fix dumplisteners missing folder creation PaperMC/Paper@b07d5e0 Limit pet look distance (#8612) PaperMC/Paper@476ef25 Add missing Fluid type (#8608)
This commit is contained in:
@@ -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 10260368f1ed23634befc3a3a44033b5cfeb7a7b..1d4db3c4130750de6d13d59ece0713a41bfdbe21 100644
|
||||
index 236b95fc8dfe0157e5af2b2a20973a9e36b9c604..91d327fc77d3b42a48eef06ed4347560fe7f57f9 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -1347,7 +1347,7 @@ public class ServerPlayer extends Player {
|
||||
@@ -1354,7 +1354,7 @@ public class ServerPlayer extends Player {
|
||||
return entitymonster.isPreventingPlayerRest(this);
|
||||
});
|
||||
|
||||
@@ -18,7 +18,7 @@ index 10260368f1ed23634befc3a3a44033b5cfeb7a7b..1d4db3c4130750de6d13d59ece0713a4
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
index 63434a7e92dbc10ec957bd14a040997e56944f6e..a1ed00066243e86c796acf49ed830b184e4871c5 100644
|
||||
index 61757ab81e39741a9f2d3ea6c1c354eb64c992dc..91e1ea30559a28af96aed5cf0f454c5fa782355b 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
@@ -354,6 +354,7 @@ public class PurpurWorldConfig {
|
||||
|
||||
Reference in New Issue
Block a user