mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 20:16:19 +01:00
d8e07590e3
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: 5dbedae1 PR-864: Fix Registry#match() failing namespaced inputs 49256865 PR-863: Fix boolean PersistentDataType 9f15450b SPIGOT-7195, SPIGOT-7197: Add DataPack API ebef5b6a Disable InterfaceIsType Checkstyle check 01d577f5 Slight tweak to boolean PersistentDataType javadoc d2b99e56 PR-857: Add boolean PersistentDataType CraftBukkit Changes: 2270366cd PR-1196: Test Registry instances more thoroughly 863dacb7a PR-1191: Do not start on pre-release Java 17 1f2dd8e12 SPIGOT-7362: Properly handle null in CraftBlock#blockFaceToNotch() dbc70bed5 SPIGOT-7195, SPIGOT-7197: Add DataPack API
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 29 Feb 2016 17:24:57 -0600
|
|
Subject: [PATCH] Add getTPS method
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 003d1613fb1b5a24146fb3eeba0be7bf5a4eb8b8..ad7ab68bb2cb4516217984c1c8c07f7a892734a0 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1912,6 +1912,17 @@ public final class Bukkit {
|
|
return server.getEntity(uuid);
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the current server TPS
|
|
+ * @return current server TPS (1m, 5m, 15m in Paper-Server)
|
|
+ */
|
|
+ @NotNull
|
|
+ public static double[] getTPS() {
|
|
+ return server.getTPS();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Get the advancement specified by this key.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 15b07d05d948d5df21591dc9e1b0fc0232c984ec..1f09705726d9114821eeb8321805cac0f7966944 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1630,6 +1630,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
@Nullable
|
|
Entity getEntity(@NotNull UUID uuid);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the current server TPS
|
|
+ *
|
|
+ * @return current server TPS (1m, 5m, 15m in Paper-Server)
|
|
+ */
|
|
+ @NotNull
|
|
+ public double[] getTPS();
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Get the advancement specified by this key.
|
|
*
|