diff --git a/patches/server/0105-Configurable-daylight-cycle.patch b/patches/server/0105-Configurable-daylight-cycle.patch index e01e429d1..7b13b80a6 100644 --- a/patches/server/0105-Configurable-daylight-cycle.patch +++ b/patches/server/0105-Configurable-daylight-cycle.patch @@ -17,58 +17,76 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) { this.gameTime = time % 192000; // Paper - fix guardian beam +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index 70dfa4d3b7a2c9b2a47000bf26100f174ab67d46..9e62e7ba26648d3ffa393f47a1de1d14182ceb36 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -1583,7 +1583,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return blockposition1.getY() == this.getLevel().getHeight(Heightmap.Types.WORLD_SURFACE, blockposition1.getX(), blockposition1.getZ()) - 1; diff --git a/patches/server/0209-Customizable-sleeping-actionbar-messages.patch b/patches/server/0209-Customizable-sleeping-actionbar-messages.patch index 1feba25cf..4dea6b6d4 100644 --- a/patches/server/0209-Customizable-sleeping-actionbar-messages.patch +++ b/patches/server/0209-Customizable-sleeping-actionbar-messages.patch @@ -5,10 +5,10 @@ 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 2eba2af9bb3fb0aaa9b2f5af6ae5fd207e1db93d..40466cdbd97228662a1eeb3bb08e8172bf344410 100644 +index 474bb004678d9482a3fc5c00b2bcf3f3a293f217..5a42fde11c219a1572bf31663487ff1fff0d1312 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -945,11 +945,29 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -949,11 +949,29 @@ public class ServerLevel extends Level implements WorldGenLevel { if (this.canSleepThroughNights()) { if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) { int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE); @@ -40,7 +40,7 @@ index 2eba2af9bb3fb0aaa9b2f5af6ae5fd207e1db93d..40466cdbd97228662a1eeb3bb08e8172 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 0ccb09e9c00f7434f4158001c983ab547c7b56e0..049bf902e8e77d7eac8dc868593c215bf04838a9 100644 +index ad8d92f04524fa6e7a7a4c390e8b744889dae968..e230f65d8599f1d6f8c567227859935a905426f8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -168,6 +168,8 @@ public class PurpurConfig { diff --git a/patches/server/0231-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0231-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch index f56c55d0f..bcbd28c38 100644 --- a/patches/server/0231-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch +++ b/patches/server/0231-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 40466cdbd97228662a1eeb3bb08e8172bf344410..1eed6e330118954796d4d642bd78c896d95eb496 100644 +index 5a42fde11c219a1572bf31663487ff1fff0d1312..8994844b6519082244fe95c1ba72dc81ac9f7f64 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1106,6 +1106,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1110,6 +1110,7 @@ public class ServerLevel extends Level implements WorldGenLevel { private void resetWeatherCycle() { // CraftBukkit start @@ -16,7 +16,7 @@ index 40466cdbd97228662a1eeb3bb08e8172bf344410..1eed6e330118954796d4d642bd78c896 this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - when passing the night // If we stop due to everyone sleeping we should reset the weather duration to some other random value. // Not that everyone ever manages to get the whole server to sleep at the same time.... -@@ -1113,6 +1114,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1117,6 +1118,7 @@ public class ServerLevel extends Level implements WorldGenLevel { this.serverLevelData.setRainTime(0); } // CraftBukkit end