mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
57dd397155
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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
114 lines
3.3 KiB
Diff
114 lines
3.3 KiB
Diff
From 1a22ffd8516da4b7847376075d625328f552b082 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.26.2
|
|
|