Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 01:17:44 +01:00
Code Issues Projects Releases Wiki Activity

Forgot to convert duration to millis per the API expectation for tick event

Browse Source
This commit is contained in:
Aikar 2019-03-28 01:27:39 -04:00
parent be067fea11
commit def0033929
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0430-Server-Tick-Events.patch
View File

@ -1,4 +1,4 @@
From a64fa8711ba3b64574459546673a90803f46011d Mon Sep 17 00:00:00 2001
From 1c8319a0ee657a502aa5f7a42fb4a2668928ecbd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 27 Mar 2019 22:48:45 -0400
Subject: [PATCH] Server Tick Events
@ -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 b93fccf91..9a56afeb3 100644
index b93fccf91..d6250c472 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -927,6 +927,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -24,7 +24,7 @@ index b93fccf91..9a56afeb3 100644
+ // Paper start
+ long endTime = System.nanoTime();
+ long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
+ new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.ticks, endTime - lastTick, remaining).callEvent();
+ new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.ticks, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
+ // Paper end
co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
}