mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 17:07:34 +01:00
2712c68885
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:
f1e73b03 #525: Add contributors plugin.yml field.
ef0999fe #529: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey
CraftBukkit Changes:
8b831a965 #714: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey
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 f1585968b13007b0f9b8c69ac3c2eff28a0fc89e..59f0ba664dd945f24eaf9e38e98fdef0c4aaaa92 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1412,6 +1412,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 6cbc22c08ce421bcd8bf3efabc96c9cec447faee..5cf43d538eee6eff031a93ab28f8f33c661acee3 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1185,6 +1185,16 @@ public interface Server extends PluginMessageRecipient {
|
|
@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.
|
|
*
|