34 lines
1.9 KiB
Diff
34 lines
1.9 KiB
Diff
|
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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index 2222c1bb5f8625eee4d88946e4bfdfa2fe598977..083e421f8496b5336af473b108498ed28b984774 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -166,4 +166,9 @@ public class PaperWorldConfig {
|
||
|
|
private void disableExplosionKnockback(){
|
||
|
|
disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public boolean disableThunder;
|
||
|
|
+ private void disableThunder() {
|
||
|
|
+ disableThunder = getBoolean("disable-thunder", false);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
index d2bb9385fbc21cdef6cef06680fac685d3da3570..3fc8fb197400c63bc85f57ff484803659619f775 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
@@ -580,7 +580,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||
|
|
gameprofilerfiller.push("thunder");
|
||
|
|
BlockPos blockposition;
|
||
|
|
|
||
|
|
- if (flag && this.isThundering() && this.random.nextInt(100000) == 0) {
|
||
|
|
+ if (!this.paperConfig.disableThunder && flag && this.isThundering() && this.random.nextInt(100000) == 0) { // Paper - Disable thunder
|
||
|
|
blockposition = this.findLightingTargetAround(this.getBlockRandomPos(j, 0, k, 15));
|
||
|
|
if (this.isRainingAt(blockposition)) {
|
||
|
|
DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
|