mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-03 09:19:38 +01:00
9ff01b16ab
This will be used by my next commit. But trying to get the build going since CI blew up
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 5491f2f781884e632797d341eb903226e831f478 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 491a8a7..a665e3a 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -226,4 +226,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 e2a7187..f87cd59 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -417,7 +417,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
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
|
|
|