Bring task execution into server tick timings (#2357)

This commit is contained in:
Spottedleaf
2019-07-23 20:20:14 -07:00
parent 68a4cc5c06
commit 6d4ae38bae
34 changed files with 235 additions and 146 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
Fires event at start and end of a server tick
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c92586ccd..73b8f7f99 100644
index 7959fba8a8..d72c02680c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -18,9 +18,9 @@ index c92586ccd..73b8f7f99 100644
++this.ticks;
this.b(booleansupplier);
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.methodProfiler.exit();
org.spigotmc.WatchdogThread.tick(); // Spigot
this.slackActivityAccountant.tickEnded(l); // Spigot
this.executeAll();
}
// Paper end
+ // Paper start
+ long endTime = System.nanoTime();
+ long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;