mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 03:32:46 +01:00
5b6dfb3463
This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From fa2fd885d88a3298213da1a7fb2e5375ac473f7b 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 be92c1af6..efacd5ea0 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -152,4 +152,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 420cbee6a..7a9cd1398 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -491,7 +491,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
int l;
|
|
BlockPosition blockposition;
|
|
|
|
- if (flag && flag1 && this.random.nextInt(100000) == 0) {
|
|
+ if (!this.paperConfig.disableThunder && flag && flag1 && this.random.nextInt(100000) == 0) { // Paper - Disable thunder
|
|
this.m = this.m * 3 + 1013904223;
|
|
l = this.m >> 2;
|
|
blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
|
|
--
|
|
2.18.0
|
|
|