mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Limit TNT Detonations per tick

Browse source 
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.

By: Aikar <aikar@aikar.co>
This commit is contained in:
CraftBukkit/Spigot 2014-08-20 18:12:32 -04:00
parent c34736a0d2
commit d7f3ba3df3
3 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
paper-server/patches/sources/net/minecraft/world/entity/item/PrimedTnt.java.patch
View file

@ -21,7 +21,15 @@
public PrimedTnt(EntityType<? extends PrimedTnt> type, Level world) { public PrimedTnt(EntityType<? extends PrimedTnt> type, Level world) {
super(type, world); super(type, world);
@@ -107,10 +114,13 @@ @@ -94,6 +101,7 @@
@Override
public void tick() {
+ if (this.level().spigotConfig.maxTntTicksPerTick > 0 && ++this.level().spigotConfig.currentPrimedTnt > this.level().spigotConfig.maxTntTicksPerTick) { return; } // Spigot
this.handlePortal();
this.applyGravity();
this.move(MoverType.SELF, this.getDeltaMovement());
@@ -107,10 +115,13 @@
this.setFuse(i); this.setFuse(i);
if (i <= 0) { if (i <= 0) {
@ -36,7 +44,7 @@
} else { } else {
this.updateInWaterStateAndDoFluidPushing(); this.updateInWaterStateAndDoFluidPushing();
if (this.level().isClientSide) { if (this.level().isClientSide) {
@@ -121,7 +131,13 @@ @@ -121,7 +132,13 @@
} }
private void explode() { private void explode() {

13
paper-server/patches/sources/net/minecraft/world/level/Level.java.patch
View file

@ -208,7 +208,7 @@
LevelChunk chunk = this.getChunkAt(pos); LevelChunk chunk = this.getChunkAt(pos);
Block block = state.getBlock(); Block block = state.getBlock();
- BlockState iblockdata1 = chunk.setBlockState(pos, state, (flags & 64) != 0); - BlockState iblockdata1 = chunk.setBlockState(pos, state, (flags & 64) != 0);
+
+ // CraftBukkit start - capture blockstates + // CraftBukkit start - capture blockstates
+ boolean captured = false; + boolean captured = false;
+ if (this.captureBlockStates && !this.capturedBlockStates.containsKey(pos)) { + if (this.captureBlockStates && !this.capturedBlockStates.containsKey(pos)) {
@ -217,7 +217,7 @@
+ captured = true; + captured = true;
+ } + }
+ // CraftBukkit end + // CraftBukkit end
+
+ BlockState iblockdata1 = chunk.setBlockState(pos, state, (flags & 64) != 0, (flags & 1024) == 0); // CraftBukkit custom NO_PLACE flag + BlockState iblockdata1 = chunk.setBlockState(pos, state, (flags & 64) != 0, (flags & 1024) == 0); // CraftBukkit custom NO_PLACE flag
+ +
if (iblockdata1 == null) { if (iblockdata1 == null) {
@ -373,13 +373,14 @@
Iterator<TickingBlockEntity> iterator = this.blockEntityTickers.iterator(); Iterator<TickingBlockEntity> iterator = this.blockEntityTickers.iterator();
boolean flag = this.tickRateManager().runsNormally(); boolean flag = this.tickRateManager().runsNormally();
@@ -459,13 +661,16 @@ @@ -459,13 +661,17 @@
} }
} }
+ this.timings.tileEntityTick.stopTiming(); // Spigot + this.timings.tileEntityTick.stopTiming(); // Spigot
this.tickingBlockEntities = false; this.tickingBlockEntities = false;
gameprofilerfiller.pop(); gameprofilerfiller.pop();
+ this.spigotConfig.currentPrimedTnt = 0; // Spigot
} }
public <T extends Entity> void guardEntityTick(Consumer<T> tickConsumer, T entity) { public <T extends Entity> void guardEntityTick(Consumer<T> tickConsumer, T entity) {
@ -390,7 +391,7 @@
} catch (Throwable throwable) { } catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking entity"); CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking entity");
CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being ticked"); CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being ticked");
@@ -510,13 +715,29 @@ @@ -510,13 +716,29 @@
@Nullable @Nullable
@Override @Override
public BlockEntity getBlockEntity(BlockPos pos) { public BlockEntity getBlockEntity(BlockPos pos) {
@ -421,7 +422,7 @@
this.getChunkAt(blockposition).addAndRegisterBlockEntity(blockEntity); this.getChunkAt(blockposition).addAndRegisterBlockEntity(blockEntity);
} }
} }
@@ -643,7 +864,7 @@ @@ -643,7 +865,7 @@
for (int k = 0; k < j; ++k) { for (int k = 0; k < j; ++k) {
EnderDragonPart entitycomplexpart = aentitycomplexpart[k]; EnderDragonPart entitycomplexpart = aentitycomplexpart[k];
@ -430,7 +431,7 @@
if (t0 != null && predicate.test(t0)) { if (t0 != null && predicate.test(t0)) {
result.add(t0); result.add(t0);
@@ -912,7 +1133,7 @@ @@ -912,7 +1134,7 @@
public static enum ExplosionInteraction implements StringRepresentable { public static enum ExplosionInteraction implements StringRepresentable {

11
paper-server/src/main/java/org/spigotmc/SpigotWorldConfig.java
View file

@ -356,4 +356,15 @@ public class SpigotWorldConfig
this.sprintMultiplier = (float) this.getDouble( "hunger.sprint-multiplier", 0.1 ); this.sprintMultiplier = (float) this.getDouble( "hunger.sprint-multiplier", 0.1 );
this.otherMultiplier = (float) this.getDouble( "hunger.other-multiplier", 0.0 ); this.otherMultiplier = (float) this.getDouble( "hunger.other-multiplier", 0.0 );
} }
public int currentPrimedTnt = 0;
public int maxTntTicksPerTick;
private void maxTntPerTick() {
if ( SpigotConfig.version < 7 )
{
this.set( "max-tnt-per-tick", 100 );
}
this.maxTntTicksPerTick = this.getInt( "max-tnt-per-tick", 100 );
this.log( "Max TNT Explosions: " + this.maxTntTicksPerTick );
}
} }