56 lines
2.2 KiB
Diff
56 lines
2.2 KiB
Diff
|
From c9626773c1837d038d971c4016e14f1feb7b9d8e 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.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||
|
|
index 13cbc79..2214660 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||
|
|
@@ -42,6 +42,7 @@ public class EntityTNTPrimed extends Entity {
|
||
|
|
}
|
||
|
|
|
||
|
|
public void h() {
|
||
|
|
+ if (world.spigotConfig.currentPrimedTnt++ > world.spigotConfig.maxTntTicksPerTick) { return; } // Spigot
|
||
|
|
this.lastX = this.locX;
|
||
|
|
this.lastY = this.locY;
|
||
|
|
this.lastZ = this.locZ;
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||
|
|
index f9dc0fc..91f036b 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||
|
|
@@ -514,6 +514,7 @@ public class WorldServer extends World {
|
||
|
|
}
|
||
|
|
|
||
|
|
super.tickEntities();
|
||
|
|
+ spigotConfig.currentPrimedTnt = 0; // Spigot
|
||
|
|
}
|
||
|
|
|
||
|
|
public void i() {
|
||
|
|
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||
|
|
index 3500931..5e3dbf9 100644
|
||
|
|
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||
|
|
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||
|
|
@@ -338,4 +338,15 @@ public class SpigotWorldConfig
|
||
|
|
combatExhaustion = (float) getDouble( "hunger.combat-exhaustion", 0.3 );
|
||
|
|
regenExhaustion = (float) getDouble( "hunger.regen-exhaustion", 3 );
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public int currentPrimedTnt = 0;
|
||
|
|
+ public int maxTntTicksPerTick;
|
||
|
|
+ private void maxTntPerTick() {
|
||
|
|
+ if ( SpigotConfig.version < 7 )
|
||
|
|
+ {
|
||
|
|
+ set( "max-tnt-per-tick", 100 );
|
||
|
|
+ }
|
||
|
|
+ maxTntTicksPerTick = getInt( "max-tnt-per-tick", 100 );
|
||
|
|
+ log( "Max TNT Explosions: " + maxTntTicksPerTick );
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.9.1
|
||
|
|
|