2015-09-13 02:57:39 +02:00
From 293682fbe2ac59c0b9e4409994d61b8ce4389794 Mon Sep 17 00:00:00 2001
2015-04-13 22:48:16 +02:00
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 13 Apr 2015 15:47:15 -0500
2015-03-23 20:40:52 +01:00
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
2015-09-13 02:57:39 +02:00
index effac28..a94c6dc 100644
2015-03-23 20:40:52 +01:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
2015-04-13 22:48:16 +02:00
@@ -611,6 +611,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
if (false) { // CraftBukkit
2015-03-23 20:40:52 +01:00
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) {
2015-04-13 22:48:16 +02:00
@@ -619,7 +621,11 @@ public class WorldServer extends World implements IAsyncTaskHandler {
2015-03-23 20:40:52 +01:00
i = 1000;
}
// CraftBukkit end
+ */
+ if (i > paperSpigotConfig.tickNextTickCap) {
+ i = paperSpigotConfig.tickNextTickCap;
}
+ // PaperSpigot end
this.methodProfiler.a("cleaning");
2015-04-17 12:54:46 +02:00
@@ -636,6 +642,23 @@ public class WorldServer extends World implements IAsyncTaskHandler {
this.V.add(nextticklistentry);
}
+ // PaperSpigot start - Allow redstone ticks to bypass the tickNextTickListCap
+ if (paperSpigotConfig.tickNextTickListCapIgnoresRedstone) {
+ Iterator<NextTickListEntry> iterator = this.M.iterator();
+ while (iterator.hasNext()) {
+ NextTickListEntry next = iterator.next();
+ if (!flag && next.b > this.worldData.getTime()) {
+ break;
+ }
+
+ if (next.a().isPowerSource() || next.a() instanceof IContainer) {
+ iterator.remove();
+ this.V.add(next);
+ }
+ }
+ }
+ // PaperSpigot end
+
this.methodProfiler.b();
this.methodProfiler.a("ticking");
Iterator iterator = this.V.iterator();
2015-03-23 20:40:52 +01:00
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
2015-09-13 02:57:39 +02:00
index c1f21ae..8421e3b 100644
2015-03-23 20:40:52 +01:00
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
2015-06-04 12:57:23 +02:00
@@ -234,4 +234,14 @@ public class PaperSpigotWorldConfig
2015-06-04 10:42:09 +02:00
{
netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
2015-03-23 20:40:52 +01:00
}
+
+ public int tickNextTickCap;
2015-04-17 12:54:46 +02:00
+ public boolean tickNextTickListCapIgnoresRedstone;
2015-03-23 20:40:52 +01:00
+ private void tickNextTickCap()
+ {
2015-03-25 00:28:19 +01:00
+ tickNextTickCap = getInt( "tick-next-tick-list-cap", 10000 ); // Higher values will be friendlier to vanilla style mechanics (to a point) but may hurt performance
2015-04-17 12:54:46 +02:00
+ tickNextTickListCapIgnoresRedstone = getBoolean( "tick-next-tick-list-cap-ignores-redstone", false ); // Redstone TickNextTicks will always bypass the preceding cap.
2015-03-23 20:40:52 +01:00
+ log( "WorldServer TickNextTick cap set at " + tickNextTickCap );
2015-04-17 12:54:46 +02:00
+ log( "WorldServer TickNextTickList cap always processes redstone: " + tickNextTickListCapIgnoresRedstone );
2015-03-23 20:40:52 +01:00
+ }
}
--
2015-09-13 02:57:39 +02:00
2.5.1
2015-03-23 20:40:52 +01:00