Paper-Old/patches/server/0046-Disable-thunder.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 14:52:43 -0600
Subject: [PATCH] Disable thunder


diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 711318ddc706e72dbd8cea1c541058c881086f21..ff80e95bf91b8f0e60dfc1183dd9fba2dba2719d 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -616,7 +616,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
         ProfilerFiller gameprofilerfiller = this.getProfiler();
 
         gameprofilerfiller.push("thunder");
-        if (flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot
+        if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - Option to disable thunder
             BlockPos blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15));
 
             if (this.isRainingAt(blockposition)) {
Move patches around 2021-06-11 14:02:28 +02:00			`From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
			`From: Sudzzy <originmc@outlook.com>`
			`Date: Wed, 2 Mar 2016 14:52:43 -0600`
			`Subject: [PATCH] Disable thunder`


			`diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java`
62 2024-06-13 19:12:48 +02:00			`index 711318ddc706e72dbd8cea1c541058c881086f21..ff80e95bf91b8f0e60dfc1183dd9fba2dba2719d 100644`
Move patches around 2021-06-11 14:02:28 +02:00			`--- a/src/main/java/net/minecraft/server/level/ServerLevel.java`
			`+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java`
62 2024-06-13 19:12:48 +02:00			`@@ -616,7 +616,7 @@ public class ServerLevel extends Level implements WorldGenLevel {`
more more work 2023-09-21 21:54:46 +02:00			`ProfilerFiller gameprofilerfiller = this.getProfiler();`
Move patches around 2021-06-11 14:02:28 +02:00
more more work 2023-09-21 21:54:46 +02:00			`gameprofilerfiller.push("thunder");`
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6823) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 58c2d3c7 SPIGOT-6771: Help command tab completion does not respect permissions CraftBukkit Changes: fd50041d SPIGOT-6768: Remove upper bound on setFreezeTicks Spigot Changes: 38929296 SPIGOT-6767: Configurable Thunder Chance 2021-10-24 19:38:23 +02:00			`- if (flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot`
[ci skip] (Mostly) finish adding identifying patch comments 2024-01-24 11:45:17 +01:00			`+ if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - Option to disable thunder`
more more work 2023-09-21 21:54:46 +02:00			`BlockPos blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15));`

Move patches around 2021-06-11 14:02:28 +02:00			`if (this.isRainingAt(blockposition)) {`