PaperMC/Spigot-API-Patches/0179-Server-Tick-Events.patch
Spottedleaf 5c7081fecc Update upstream & fix some chunk related issues (#2177)
* Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories

CraftBukkit Changes:
4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories
e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.
d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs

* Bring Chunk load checks in-line with spigot

As of the last upstream merge spigot now checks ticket level status
when returning loaded chunks for a world from api. Now our checks
will respect that decision.

* Fix spawn ticket levels

Vanilla would keep the inner chunks of spawn available for ticking,
however my changes made all chunks non-ticking. Resolve by changing
ticket levels for spawn chunks inside the border to respect this
behavior.


* Make World#getChunkIfLoadedImmediately return only entity ticking chunks

Mojang appears to be using chunks with level > 33 (non-ticking chunks)
as cached chunks and not actually loaded chunks.

* Bring all loaded checks in line with spigot

Loaded chunks must be at least border  chunks, or level <= 33
2019-06-14 03:27:40 +01:00

113 lines
3.3 KiB
Diff

From 4b52e53d9edd013e687d915bd4e605ba4192760a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 27 Mar 2019 21:58:55 -0400
Subject: [PATCH] Server Tick Events
Fires event at start and end of a server tick
diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java
new file mode 100644
index 000000000..9fd28e036
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java
@@ -0,0 +1,59 @@
+package com.destroystokyo.paper.event.server;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Called when the server has finished ticking the main loop
+ */
+public class ServerTickEndEvent extends Event {
+
+ private static final HandlerList handlers = new HandlerList();
+ private final int tickNumber;
+ private final double tickDuration;
+ private final long timeEnd;
+
+ public ServerTickEndEvent(int tickNumber, double tickDuration, long timeRemaining) {
+ this.tickNumber = tickNumber;
+ this.tickDuration = tickDuration;
+ this.timeEnd = System.nanoTime() + timeRemaining;
+ }
+
+ /**
+ * @return What tick this was since start (first tick = 1)
+ */
+ public int getTickNumber() {
+ return tickNumber;
+ }
+
+ /**
+ * @return Time in milliseconds of how long this tick took
+ */
+ public double getTickDuration() {
+ return tickDuration;
+ }
+
+ /**
+ * Amount of nanoseconds remaining before the next tick should start.
+ *
+ * If this value is negative, then that means the server has exceeded the tick time limit and TPS has been lost.
+ *
+ * Method will continously return the updated time remaining value. (return value is not static)
+ *
+ * @return Amount of nanoseconds remaining before the next tick should start
+ */
+ public long getTimeRemaining() {
+ return this.timeEnd - System.nanoTime();
+ }
+
+ @NotNull
+ public HandlerList getHandlers() {
+ return handlers;
+ }
+
+ @NotNull
+ public static HandlerList getHandlerList() {
+ return handlers;
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java
new file mode 100644
index 000000000..eac85f1f4
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java
@@ -0,0 +1,32 @@
+package com.destroystokyo.paper.event.server;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+public class ServerTickStartEvent extends Event {
+
+ private static final HandlerList handlers = new HandlerList();
+ private final int tickNumber;
+
+ public ServerTickStartEvent(int tickNumber) {
+ this.tickNumber = tickNumber;
+ }
+
+ /**
+ * @return What tick this is going be since start (first tick = 1)
+ */
+ public int getTickNumber() {
+ return tickNumber;
+ }
+
+ @NotNull
+ public HandlerList getHandlers() {
+ return handlers;
+ }
+
+ @NotNull
+ public static HandlerList getHandlerList() {
+ return handlers;
+ }
+}
--
2.21.0