mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 02:10:30 +01:00
37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
From 98d790acb8c4c4761a0a9999b6e8c378aa28f0c5 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 6a307d5dd6..bf0cd6a8b4 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -156,4 +156,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/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index b9e1816e82..9555afbd8d 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -383,7 +383,7 @@ public class WorldServer extends World {
|
|
gameprofilerfiller.enter("thunder");
|
|
BlockPosition blockposition;
|
|
|
|
- if (flag && this.U() && this.random.nextInt(100000) == 0) {
|
|
+ if (!this.paperConfig.disableThunder && flag && this.U() && this.random.nextInt(100000) == 0) { // Paper - Disable thunder
|
|
blockposition = this.a(this.a(j, 0, k, 15));
|
|
if (this.isRainingAt(blockposition)) {
|
|
DifficultyDamageScaler difficultydamagescaler = this.getDamageScaler(blockposition);
|
|
--
|
|
2.22.0
|
|
|