PaperMC/Spigot-Server-Patches/0042-Disable-thunder.patch

38 lines
1.6 KiB
Diff
Raw Normal View History

From 923f3d8ea4be870cbea8dbc9f3d868b766969bdf Mon Sep 17 00:00:00 2001
2016-03-01 00:09:49 +01:00
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 2626f81..1a341d8 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -216,4 +216,9 @@ public class PaperWorldConfig {
2016-03-01 00:09:49 +01:00
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
2016-03-31 02:50:23 +02:00
index 8b90615..94b5c37 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
2016-03-31 02:50:23 +02:00
@@ -420,7 +420,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
2016-03-01 00:09:49 +01:00
int l;
BlockPosition blockposition;
- if (flag && flag1 && this.random.nextInt(100000) == 0) {
+ // Paper - Disable thunder
+ if (!this.paperConfig.disableThunder && flag && flag1 && this.random.nextInt(100000) == 0) {
this.l = this.l * 3 + 1013904223;
l = this.l >> 2;
blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
--
2.7.4
2016-03-01 00:09:49 +01:00