mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 12:36:07 +01:00
928bcc8d3a
Upstream has released updates that appear 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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
111 lines
3.4 KiB
Diff
111 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..9fd28e03649f66f71fb7f0536a137557ec32cd25
|
|
--- /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 0000000000000000000000000000000000000000..eac85f1f49088bb71afb01eff4d5f53887306461
|
|
--- /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;
|
|
+ }
|
|
+}
|