mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
5ddabb083e
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@88a3a870 Configurable xp orb merge group count (#12503) PaperMC/Paper@53d1d04e Disable Item Obfuscation for entity related stacks (#12297) PaperMC/Paper@c98cd658 Add configuration interface to expose certain config values (#12273) PaperMC/Paper@42a2a6c2 Supports the ability for commands to be registered internally (#12520) PaperMC/Paper@753cff7c Improvements for Dump paper commands (#12512) PaperMC/Paper@e2da5d2f Registry API for supported Mob Variants (#12417) PaperMC/Paper@ab0253fe Expand PlayerDeathEvent API (#12221) PaperMC/Paper@cbcf75a5 Update visual fire handling with TriState support (#12303) PaperMC/Paper@6c3964d2 Properly save level data async (#12530) PaperMC/Paper@d2ad2e66 Add missing EntityLookup#getAllMapped from Moonrise PaperMC/Paper@358e72ec Remove simplify remote item matching stuff for now PaperMC/Paper@04ffca0b Also remove CraftPlayer methods PaperMC/Paper@a2525819 Update mache PaperMC/Paper@d683970d Add FishHookStateChangeEvent (#12165) PaperMC/Paper@369ad170 Cached tag parser for itemstack reading (#12547) PaperMC/Paper@841d6342 Fix ItemStack#addUnsafeEnchantment ignored for missing enchantment component (#12549) PaperMC/Paper@c000b352 fix(bukkit-brig-forwarding-map): Invert isEmpty method (#12555) PaperMC/Paper@28d7df75 Backport HeroesOfTheVillage datafixer fix PaperMC/Paper@f1dbed07 Implement BlocksAttack DamageReduction and ItemDamage (#12538) PaperMC/Paper@cc38032b Deprecate TeleportCause CHORUS_FRUIT for CONSUMABLE_EFFECT (#12546) PaperMC/Paper@35878677 [ci/skip] Fix format and mentions for ItemDamageFunction (#12560) PaperMC/Paper@7171d299 [ci/skip] Mention CAN_PLACE/CAN_BREAK component in ItemMeta (#12559) PaperMC/Paper@6f73e62e Add getPickItemStack (#12552) PaperMC/Paper@ce0fa4c4 Replace old version command with brigadier equivalent (#12502) PaperMC/Paper@fa360aa8 Add some missing annotations and an incorrect one (#12204) PaperMC/Paper@113b18ee Update paperweight and Gradle wrapper (#12573) PaperMC/Paper@f303a076 fix: Don't hardcode checks for translation registries (#12571) PaperMC/Paper@87349c31 Fix CombatTracker stale on death (#12562) PaperMC/Paper@b70bca6b Revert "fix: Don't hardcode checks for translation registries (#12571)" Purpur Changes: PurpurMC/Purpur@93011bc1 Add configuration setting to re-add End void rings (#1656) PurpurMC/Purpur@c2f48591 [ci/skip] only set default world config values once PurpurMC/Purpur@6f5bbae5 [ci/skip] move some code around PurpurMC/Purpur@5c1a9835 fix issue with `shift-right-click-repairs-mending-points` PurpurMC/Purpur@3156e446 check damage value of tool correctly PurpurMC/Purpur@a9fe4f25 Updated Upstream (Paper) PurpurMC/Purpur@9d0aa8eb Updated Upstream (Paper) PurpurMC/Purpur@603c7557 Updated Upstream (Paper) PurpurMC/Purpur@eca78060 Updated Upstream (Paper) PurpurMC/Purpur@e4e9cfdf Updated Upstream (Paper) PurpurMC/Purpur@3de2fc7d Updated Upstream (Paper) PurpurMC/Purpur@09f547de add `mob-griefing-override` config options (#1661) PurpurMC/Purpur@1dd9bd0c Updated Upstream (Paper) PurpurMC/Purpur@7a8aa86a finish updating gradle PurpurMC/Purpur@fd78b90f bandaid fix: increase the daemon heap for now
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 c9ea6559f809a6732588b8908001807be3d91196..1e810d7f61e07cddd99d3f827673b724ac93b6b5 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -2438,6 +2438,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 c1e4f01dbec2a796025ef35b6fdd68a82fa319d1..cfe600ed503994376284d71d6754d1a736048401 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -2126,6 +2126,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)
|
|
*
|