spigot/CraftBukkit-Patches/0076-Limit-TNT-Detonations-per-tick.patch

56 lines
2.5 KiB
Diff
Raw Normal View History

2023-09-22 02:40:00 +10:00
From 6be16eee4e0a82782205a93de48f263d2b879b47 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Aug 2014 18:12:32 -0400
Subject: [PATCH] Limit TNT Detonations per tick
This gives a per-world control on how much TNT will be processed per-tick,
preventing a massive TNT detonation from lagging out the server.
2021-03-16 09:00:00 +11:00
diff --git a/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java b/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java
2023-09-22 02:40:00 +10:00
index 1bae42cf58..9cf5994f7e 100644
2021-03-16 09:00:00 +11:00
--- a/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java
2023-06-24 17:19:51 +10:00
@@ -64,6 +64,7 @@ public class EntityTNTPrimed extends Entity implements TraceableEntity {
2019-04-23 12:00:00 +10:00
@Override
2018-07-15 10:00:00 +10:00
public void tick() {
2023-06-08 01:30:00 +10:00
+ if (this.level().spigotConfig.maxTntTicksPerTick > 0 && ++this.level().spigotConfig.currentPrimedTnt > this.level().spigotConfig.maxTntTicksPerTick) { return; } // Spigot
2019-12-11 09:00:00 +11:00
if (!this.isNoGravity()) {
2021-11-22 09:00:00 +11:00
this.setDeltaMovement(this.getDeltaMovement().add(0.0D, -0.04D, 0.0D));
2019-12-11 09:00:00 +11:00
}
2021-03-16 09:00:00 +11:00
diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
2023-09-22 02:40:00 +10:00
index c331438113..15e63dbfa4 100644
2021-03-16 09:00:00 +11:00
--- a/src/main/java/net/minecraft/world/level/World.java
+++ b/src/main/java/net/minecraft/world/level/World.java
2023-06-08 01:30:00 +10:00
@@ -660,6 +660,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
2021-06-11 15:00:00 +10:00
timings.tileEntityTick.stopTiming(); // Spigot
this.tickingBlockEntities = false;
2021-11-22 09:00:00 +11:00
gameprofilerfiller.pop();
+ spigotConfig.currentPrimedTnt = 0; // Spigot
}
2021-11-22 09:00:00 +11:00
public <T extends Entity> void guardEntityTick(Consumer<T> consumer, T t0) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
2023-09-22 02:40:00 +10:00
index 1b5d1e2837..8411f9e573 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -356,4 +356,15 @@ public class SpigotWorldConfig
2016-11-26 11:51:14 +11:00
sprintMultiplier = (float) getDouble( "hunger.sprint-multiplier", 0.1 );
otherMultiplier = (float) getDouble( "hunger.other-multiplier", 0.0 );
}
+
+ public int currentPrimedTnt = 0;
+ public int maxTntTicksPerTick;
+ private void maxTntPerTick() {
2014-08-24 14:25:58 +10:00
+ if ( SpigotConfig.version < 7 )
+ {
+ set( "max-tnt-per-tick", 100 );
+ }
+ maxTntTicksPerTick = getInt( "max-tnt-per-tick", 100 );
+ log( "Max TNT Explosions: " + maxTntTicksPerTick );
+ }
}
--
2023-09-22 02:40:00 +10:00
2.42.0