Option for if rain and thunder should stop on sleep

patches/server/0201-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch

@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: 12emin34 <macanovic.emin@gmail.com>
-Date: Mon, 23 Aug 2021 17:59:29 +0200
-Subject: [PATCH] Option for if rain and thunder should stop on sleep
-
-
-diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 361885b28305e1c3e314b3b9f9807cf3c5ab843a..0487d55861302e1bf84225901d873b02c2f11d6e 100644
---- a/net/minecraft/server/level/ServerLevel.java
-+++ b/net/minecraft/server/level/ServerLevel.java
-@@ -1282,6 +1282,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
-     @VisibleForTesting
-     public void resetWeatherCycle() {
-         // CraftBukkit start
-+        if (this.purpurConfig.rainStopsAfterSleep) // Purpur
-         this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
-         // 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....
-@@ -1289,6 +1290,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
-             this.serverLevelData.setRainTime(0);
-         }
-         // CraftBukkit end
-+        if (this.purpurConfig.thunderStopsAfterSleep) // Purpur
-         this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
-         // CraftBukkit start
-         // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a47ddcb40340c19ce99a8befe8034240e0457acb..e5934c276e286820944488e2d629b01d58dbf200 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -140,6 +140,8 @@ public class PurpurWorldConfig {
-     public boolean tickFluids = true;
-     public double mobsBlindnessMultiplier = 1;
-     public boolean mobsIgnoreRails = false;
-+    public boolean rainStopsAfterSleep = true;
-+    public boolean thunderStopsAfterSleep = true;
-     private void miscGameplayMechanicsSettings() {
-         useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
-         alwaysTameInCreative = getBoolean("gameplay-mechanics.always-tame-in-creative", alwaysTameInCreative);
-@@ -162,6 +164,8 @@ public class PurpurWorldConfig {
-         tickFluids = getBoolean("gameplay-mechanics.tick-fluids", tickFluids);
-         mobsBlindnessMultiplier = getDouble("gameplay-mechanics.entity-blindness-multiplier", mobsBlindnessMultiplier);
-         mobsIgnoreRails = getBoolean("gameplay-mechanics.mobs-ignore-rails", mobsIgnoreRails);
-+        rainStopsAfterSleep = getBoolean("gameplay-mechanics.rain-stops-after-sleep", rainStopsAfterSleep);
-+        thunderStopsAfterSleep = getBoolean("gameplay-mechanics.thunder-stops-after-sleep", thunderStopsAfterSleep);
-     }
- 
-     public int daytimeTicks = 12000;

purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch

@@ -145,3 +145,19 @@
                      component = Component.translatable("sleep.players_sleeping", this.sleepStatus.amountSleeping(), this.sleepStatus.sleepersNeeded(_int));
                  }
  
+@@ -1191,6 +_,7 @@
+     @VisibleForTesting
+     public void resetWeatherCycle() {
+         // CraftBukkit start
++        if (this.purpurConfig.rainStopsAfterSleep) // Purpur - Option for if rain and thunder should stop on sleep
+         this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
+         // 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....
+@@ -1198,6 +_,7 @@
+             this.serverLevelData.setRainTime(0);
+         }
+         // CraftBukkit end
++        if (this.purpurConfig.thunderStopsAfterSleep) // Purpur - Option for if rain and thunder should stop on sleep
+         this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
+         // CraftBukkit start
+         // If we stop due to everyone sleeping we should reset the weather duration to some other random value.

purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java

@@ -139,6 +139,8 @@ public class PurpurWorldConfig {
     public boolean tickFluids = true;
     public double mobsBlindnessMultiplier = 1;
     public boolean mobsIgnoreRails = false;
+    public boolean rainStopsAfterSleep = true;
+    public boolean thunderStopsAfterSleep = true;
     private void miscGameplayMechanicsSettings() {
         useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
         alwaysTameInCreative = getBoolean("gameplay-mechanics.always-tame-in-creative", alwaysTameInCreative);
@@ -161,6 +163,8 @@ public class PurpurWorldConfig {
         tickFluids = getBoolean("gameplay-mechanics.tick-fluids", tickFluids);
         mobsBlindnessMultiplier = getDouble("gameplay-mechanics.entity-blindness-multiplier", mobsBlindnessMultiplier);
         mobsIgnoreRails = getBoolean("gameplay-mechanics.mobs-ignore-rails", mobsIgnoreRails);
+        rainStopsAfterSleep = getBoolean("gameplay-mechanics.rain-stops-after-sleep", rainStopsAfterSleep);
+        thunderStopsAfterSleep = getBoolean("gameplay-mechanics.thunder-stops-after-sleep", thunderStopsAfterSleep);
     }
 
     public int daytimeTicks = 12000;