mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-23 08:49:28 +00:00
106 lines
3.9 KiB
Diff
106 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Wed, 30 Nov 2022 13:00:40 +0100
|
|
Subject: [PATCH] 5 second TPS average
|
|
|
|
License: MIT (https://opensource.org/licenses/MIT)
|
|
Gale - https://galemc.org
|
|
|
|
This patch is based on the following patch:
|
|
"Add 5 second tps average in /tps"
|
|
By: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
As part of: Purpur (https://github.com/PurpurMC/Purpur)
|
|
Licensed under: MIT (https://opensource.org/licenses/MIT)
|
|
|
|
* Purpur copyright *
|
|
|
|
MIT License
|
|
|
|
Copyright (c) 2019-2022 PurpurMC
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
in the Software without restriction, including without limitation the rights
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
The above copyright notice and this permission notice shall be included in all
|
|
copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
SOFTWARE.
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 3a4e3f5b2aec6c53adb9f812552a594a70141c13..d975042cdca36112c918b9617bd5ed335c47cd20 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -2422,7 +2422,30 @@ public final class Bukkit {
|
|
return server.getTPS();
|
|
}
|
|
|
|
+ // Gale start - Purpur - 5 second TPS average
|
|
+ /**
|
|
+ * Gets the current server TPS
|
|
+ * @return current server TPS (5s, 1m, 5m, 15m in Gale-Server)
|
|
+ */
|
|
+ @NotNull
|
|
+ public static double[] getTPSIncluding5SecondAverage() {
|
|
+ return server.getTPSIncluding5SecondAverage();
|
|
+ }
|
|
+ // Gale end - Purpur - 5 second TPS average
|
|
+
|
|
// Gale start - specific interval TPS API
|
|
+
|
|
+ // Gale start - Purpur - 5 second TPS average
|
|
+ /**
|
|
+ * Gets the average server TPS over the last 5 seconds
|
|
+ *
|
|
+ * @return the average server TPS over the last 5 seconds
|
|
+ */
|
|
+ public static double get5SecondTPSAverage() {
|
|
+ return server.get5SecondTPSAverage();
|
|
+ }
|
|
+ // Gale end - Purpur - 5 second TPS average
|
|
+
|
|
/**
|
|
* Gets the average server TPS over the last 1 minute
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 45837e97d83d1d636a13920bbba59d7388c16477..5117891d90162db55718839b71016c25f2acd88c 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -2108,7 +2108,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
*/
|
|
public double @NotNull [] getTPS();
|
|
|
|
+ // Gale start - Purpur - 5 second TPS average
|
|
+ /**
|
|
+ * Gets the current server TPS
|
|
+ *
|
|
+ * @return current server TPS (5s, 1m, 5m, 15m in Gale-Server)
|
|
+ */
|
|
+ @NotNull
|
|
+ double[] getTPSIncluding5SecondAverage();
|
|
+ // Gale end - Purpur - 5 second TPS average
|
|
+
|
|
// Gale start - specific interval TPS API
|
|
+
|
|
+ // Gale start - Purpur - 5 second TPS average
|
|
+ /**
|
|
+ * Gets the average server TPS over the last 5 seconds
|
|
+ *
|
|
+ * @return the average server TPS over the last 5 seconds
|
|
+ */
|
|
+ double get5SecondTPSAverage();
|
|
+ // Gale end - Purpur - 5 second TPS average
|
|
+
|
|
/**
|
|
* Gets the average server TPS over the last 1 minute
|
|
*
|