mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-27 19:09:22 +00:00
ae57aa904e
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1fcc4162 Implement FeatureHooks#isChunkSent for Moonrise chunk system PaperMC/Paper@e4d7178a Implement WaypointTransmitter#isChunkVisible PaperMC/Paper@8980ead7 Directly walk text component after converting from JSON PaperMC/Paper@5613ed6d Provide env environment variable and copy spigots sys prop for overriding default repository PaperMC/Paper@62b7f86d Avoid and discourage use of Maven Central as a CDN (#12689) PaperMC/Paper@f5534cb7 [ci/skip] Run generators (#12691) PaperMC/Paper@4781d28b Re-add Log4j Javadocs (#12693) PaperMC/Paper@74fbcce5 Check type of Material in get/set stats (#12607) PaperMC/Paper@4b3f967e Improve Fix MC-44654 (#12703) PaperMC/Paper@a7dd2635 Enable spigot obfuscation support (#12695) PaperMC/Paper@6a51c44e Cleanup Primed TNT Fix (#12704) PaperMC/Paper@839c6a18 Fix #11169 (#12706) PaperMC/Paper@c77d5f99 Fix MC-297591 PaperMC/Paper@219f86ee Implement chunk unload delay config option PaperMC/Paper@e4eb69b8 Do not allow ticket level decreases to be processed asynchronously PaperMC/Paper@71b0c768 Adds support for vanilla negative explosions (#12705) PaperMC/Paper@3750927a [ci/skip] Fix PermissionManager#clearPermissions() docs bad wording (#12657) PaperMC/Paper@d61a51e8 Add ItemType#getBurnDuration() (#12604) PaperMC/Paper@29fc8532 Allow empty paths in namespaced keys (#12687) PaperMC/Paper@4419afb9 fix: Safely handle nanosecond overflow in ClickCallback (#12686) PaperMC/Paper@56528821 Add `isProxyEnabled` method to ServerConfiguration (#12664) PaperMC/Paper@c0dda0ea Add `isForceDefaultGameMode` method (#12673) PaperMC/Paper@e714de63 Fix excess slot updates PaperMC/Paper@6d0821d2 [ci/skip] Fix docs for Spawner class and cleanup (#12710) PaperMC/Paper@cceffe3d Release ItemType and BlockType (#12708) PaperMC/Paper@186e9e33 Relocate CommandMap#registerServerAliases() call to after lifecycle events have been run (#12601) PaperMC/Paper@5edcf6dd Cleanup/command dispatching (#12713) Purpur Changes: PurpurMC/Purpur@baa196f5 Updated Upstream (Paper) PurpurMC/Purpur@fdd1e980 Updated Upstream (Paper) PurpurMC/Purpur@439f15db Updated Upstream (Paper) PurpurMC/Purpur@46a28b93 [ci/skip] update version in README PurpurMC/Purpur@162bd288 Updated Upstream (Paper) PurpurMC/Purpur@afcdf9bb Updated Upstream (Paper)
83 lines
2.7 KiB
Diff
83 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Wed, 30 Nov 2022 12:57:37 +0100
|
|
Subject: [PATCH] Specific interval TPS API
|
|
|
|
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|
Gale - https://galemc.org
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 3bde4ad79ade5aae18e9073307f637717e8dd9e3..bac8bf1996350e4c16ba9a494c5d9bf052ad7fa3 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -2447,6 +2447,35 @@ public final class Bukkit {
|
|
return server.getTPS();
|
|
}
|
|
|
|
+ // Gale start - specific interval TPS API
|
|
+ /**
|
|
+ * Gets the average server TPS over the last 1 minute
|
|
+ *
|
|
+ * @return the average server TPS over the last 1 minute
|
|
+ */
|
|
+ public static double get1MinuteTPSAverage() {
|
|
+ return server.get1MinuteTPSAverage();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the average server TPS over the last 5 minutes
|
|
+ *
|
|
+ * @return the average server TPS over the last 5 minutes
|
|
+ */
|
|
+ public static double get5MinuteTPSAverage() {
|
|
+ return server.get5MinuteTPSAverage();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the average server TPS over the last 15 minutes
|
|
+ *
|
|
+ * @return the average server TPS over the last 15 minutes
|
|
+ */
|
|
+ public static double get15MinuteTPSAverage() {
|
|
+ return server.get15MinuteTPSAverage();
|
|
+ }
|
|
+ // Gale end - specific interval TPS API
|
|
+
|
|
/**
|
|
* Get a sample of the servers last tick times (in nanos)
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index c4d5af73aaaf632f84ab1a668a8fb672df145c88..1b3ee5ef28e4687de605c7befd74539e292f0bae 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -2133,6 +2133,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
*/
|
|
public double @NotNull [] getTPS();
|
|
|
|
+ // Gale start - specific interval TPS API
|
|
+ /**
|
|
+ * Gets the average server TPS over the last 1 minute
|
|
+ *
|
|
+ * @return the average server TPS over the last 1 minute
|
|
+ */
|
|
+ double get1MinuteTPSAverage();
|
|
+
|
|
+ /**
|
|
+ * Gets the average server TPS over the last 5 minutes
|
|
+ *
|
|
+ * @return the average server TPS over the last 5 minutes
|
|
+ */
|
|
+ double get5MinuteTPSAverage();
|
|
+
|
|
+ /**
|
|
+ * Gets the average server TPS over the last 15 minutes
|
|
+ *
|
|
+ * @return the average server TPS over the last 15 minutes
|
|
+ */
|
|
+ double get15MinuteTPSAverage();
|
|
+ // Gale end - specific interval TPS API
|
|
+
|
|
/**
|
|
* Get a sample of the servers last tick times (in nanos)
|
|
*
|