2019-05-06 19:30:27 +00:00
|
|
|
From 43ae5db982747cd6244b117f0fe8014f73d355ee Mon Sep 17 00:00:00 2001
|
2019-03-28 02:49:29 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 27 Mar 2019 22:48:45 -0400
|
|
|
|
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
|
2019-05-06 19:30:27 +00:00
|
|
|
index e612879495..3fc232431a 100644
|
2019-03-28 02:49:29 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2019-05-06 02:58:04 +00:00
|
|
|
@@ -1051,6 +1051,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
2019-03-28 02:49:29 +00:00
|
|
|
co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper
|
|
|
|
this.slackActivityAccountant.tickStarted(); // Spigot
|
2019-05-05 17:19:34 +00:00
|
|
|
long i = SystemUtils.getMonotonicNanos();
|
2019-03-28 02:49:29 +00:00
|
|
|
+ new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.ticks+1).callEvent(); // Paper
|
|
|
|
|
|
|
|
++this.ticks;
|
2019-05-05 17:19:34 +00:00
|
|
|
this.b(booleansupplier);
|
2019-05-06 02:58:04 +00:00
|
|
|
@@ -1097,6 +1098,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
2019-05-05 17:19:34 +00:00
|
|
|
this.methodProfiler.exit();
|
|
|
|
org.spigotmc.WatchdogThread.tick(); // Spigot
|
2019-03-28 02:49:29 +00:00
|
|
|
this.slackActivityAccountant.tickEnded(l); // Spigot
|
|
|
|
+ // Paper start
|
|
|
|
+ long endTime = System.nanoTime();
|
|
|
|
+ long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
|
2019-03-28 05:27:39 +00:00
|
|
|
+ new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.ticks, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
|
2019-03-28 02:49:29 +00:00
|
|
|
+ // Paper end
|
|
|
|
co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
|
|
|
2.21.0
|
|
|
|
|