TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2024-12-23 00:15:06 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Slow down queue a bit because 1.13+ performance is bad"

Browse source 
This reverts commit bbde2f5e06.
This commit is contained in:
dordsor21 2020-05-24 23:24:27 +01:00
parent e32a2e2723
commit 0021b114de
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/src/main/java/com/plotsquared/core/configuration/Settings.java
View file

@ -491,9 +491,9 @@ public class Settings extends Config {
@Comment("Settings relating to PlotSquared's GlobalBlockQueue") @Comment("Settings relating to PlotSquared's GlobalBlockQueue")
public static final class QUEUE { public static final class QUEUE {
@Comment({"Average time per tick spent completing chunk tasks in ms.", @Comment({"Average time per tick spent completing chunk tasks in ms. Target average TPS = 20 * 50 / TARGET_TIME.",
"Waits (chunk task time / target_time) ticks before completely the next task."}) "Waits (chunk task time / target_time) ticks before completely the next task."})
public static int TARGET_TIME = 40; public static int TARGET_TIME = 65;
} }

11
Core/src/main/java/com/plotsquared/core/queue/GlobalBlockQueue.java
View file

@ -57,7 +57,6 @@ public class GlobalBlockQueue {
private final RunnableVal2<Long, LocalBlockQueue> SET_TASK = private final RunnableVal2<Long, LocalBlockQueue> SET_TASK =
new RunnableVal2<Long, LocalBlockQueue>() { new RunnableVal2<Long, LocalBlockQueue>() {
@Override public void run(Long free, LocalBlockQueue queue) { @Override public void run(Long free, LocalBlockQueue queue) {
long t1 = System.currentTimeMillis();
do { do {
boolean more = queue.next(); boolean more = queue.next();
if (!more) { if (!more) {
@ -67,9 +66,9 @@ public class GlobalBlockQueue {
} }
return; return;
} }
} while (((GlobalBlockQueue.this.secondLast = System.currentTimeMillis()) } while ((lastPeriod =
- GlobalBlockQueue.this.last) < free); ((GlobalBlockQueue.this.secondLast = System.currentTimeMillis())
lastPeriod = System.currentTimeMillis() - t1; - GlobalBlockQueue.this.last)) < free);
} }
}; };
@ -125,8 +124,8 @@ public class GlobalBlockQueue {
lastPeriod -= targetTime; lastPeriod -= targetTime;
return; return;
} }
SET_TASK.value1 = 30 + Math.min( SET_TASK.value1 = 50 + Math.min(
(30 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last = (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
System.currentTimeMillis()), System.currentTimeMillis()),
GlobalBlockQueue.this.secondLast - System.currentTimeMillis()); GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
SET_TASK.value2 = GlobalBlockQueue.this.getNextQueue(); SET_TASK.value2 = GlobalBlockQueue.this.getNextQueue();