core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0034-Disable-thunder.patch

37 lines
1.6 KiB
Diff
Raw Normal View History

Timings changes (#3044) * Timings changes - Increment entity tick count only when an entity ticks - Remove chunk inhabited timer - Try finally entity timings * Add activated entity ticks Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2020-03-19 06:03:32 +00:00
From d04b0dfb3bb79611afbde1887e6d87b9a66f9327 Mon Sep 17 00:00:00 2001
Paper 1.9
2016-02-29 23:09:49 +00: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
Timings changes (#3044) * Timings changes - Increment entity tick count only when an entity ticks - Remove chunk inhabited timer - Try finally entity timings * Add activated entity ticks Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2020-03-19 06:03:32 +00:00
index 25e0717186..41436a4ead 100644
Paper 1.9
2016-02-29 23:09:49 +00:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Rename baby zombie movement config option This option does not set the absolute speed of the entity as the name implies. It sets a modifier. The default (vanilla) value of `0.5` sets the baby zombie to move at 50% faster than the base speed. A negative value like `-0.4` would set them to move at 40% slower. There should be no functional changes as a result of this change, it's just clarifying the config name.
2019-10-26 22:55:58 +00:00
@@ -161,4 +161,9 @@ public class PaperWorldConfig {
Paper 1.9
2016-02-29 23:09:49 +00: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
Timings changes (#3044) * Timings changes - Increment entity tick count only when an entity ticks - Remove chunk inhabited timer - Try finally entity timings * Add activated entity ticks Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2020-03-19 06:03:32 +00:00
index 5e760818fb..3ba54917af 100644
Paper 1.9
2016-02-29 23:09:49 +00:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
Timings changes (#3044) * Timings changes - Increment entity tick count only when an entity ticks - Remove chunk inhabited timer - Try finally entity timings * Add activated entity ticks Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2020-03-19 06:03:32 +00:00
@@ -445,7 +445,7 @@ public class WorldServer extends World {
Aim towards real 1.14
2019-04-25 06:53:51 +00:00
gameprofilerfiller.enter("thunder");
BlockPosition blockposition;
Paper 1.9
2016-02-29 23:09:49 +00:00
Aim towards real 1.14
2019-04-25 06:53:51 +00:00
- 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);
Paper 1.9
2016-02-29 23:09:49 +00:00
--
Timings changes (#3044) * Timings changes - Increment entity tick count only when an entity ticks - Remove chunk inhabited timer - Try finally entity timings * Add activated entity ticks Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2020-03-19 06:03:32 +00:00
2.25.2
Paper 1.9
2016-02-29 23:09:49 +00:00