From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Iceee Date: Sat, 7 Mar 2015 20:49:31 -0600 Subject: [PATCH] Fix redstone lag issues diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -0,0 +0,0 @@ import java.util.logging.Level; import org.bukkit.WeatherType; import org.bukkit.block.BlockState; -import org.bukkit.craftbukkit.util.LongHash; import org.bukkit.event.block.BlockFormEvent; import org.bukkit.event.weather.LightningStrikeEvent; @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler { if (i != this.L.size()) { throw new IllegalStateException("TickNextTick list out of synch"); } else { + // PaperSpigot start - No, stop doing this, it affects things like redstone + /* if (i > 1000) { // CraftBukkit start - If the server has too much to process over time, try to alleviate that if (i > 20 * 1000) { @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler { i = 1000; } // CraftBukkit end + */ + if (i > paperSpigotConfig.tickNextTickCap) { + i = paperSpigotConfig.tickNextTickCap; } + // PaperSpigot end this.methodProfiler.a("cleaning"); diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig System.err.println( "==========================================" ); } } + + public int tickNextTickCap; + private void tickNextTickCap() + { + tickNextTickCap = 10000; // Higher values will be friendlier to vanilla style mechanics but may hurt performance + log( "WorldServer TickNextTick cap set at " + tickNextTickCap ); + } } --