Paper/Spigot-Server-Patches/Fix-redstone-lag-issues.patch

56 lines
2.5 KiB
Diff
Raw Normal View History

2014-06-22 22:49:11 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv>
2015-03-08 02:16:09 +01:00
Date: Sat, 7 Mar 2015 20:49:31 -0600
2014-06-22 22:49:11 +02: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
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;
2014-11-28 02:17:45 +01:00
@@ -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 {
2015-03-08 02:16:09 +01:00
+ // PaperSpigot start - No, stop doing this, it affects things like redstone
2014-11-28 02:17:45 +01:00
+ /*
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;
}
2015-03-08 02:16:09 +01:00
// CraftBukkit end
+ */
+ if (i > paperSpigotConfig.tickNextTickCap) {
+ i = paperSpigotConfig.tickNextTickCap;
2014-12-01 03:09:09 +01:00
}
2014-11-28 02:17:45 +01:00
+ // PaperSpigot end
2014-06-22 22:49:11 +02:00
2014-11-28 02:17:45 +01:00
this.methodProfiler.a("cleaning");
2014-06-22 22:49:11 +02:00
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 );
+ }
}
2015-03-08 02:16:09 +01:00
--