mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-23 00:49:31 +00:00
c8ba5fedc8
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@9b1798d6 Simplify custom payload handling (#12347) PaperMC/Paper@2552abf0 fix message mutation in PlayerSetSpawnEvent PaperMC/Paper@ae99e24f fix deprecated bungee chat api methods PaperMC/Paper@dca4aab8 add util methods to CraftChatMessage PaperMC/Paper@87c9d9b0 be more lenient on url parsing for legacy format PaperMC/Paper@4a9bd2e3 Correctly clear items in PlayerDeathEvent PaperMC/Paper@a70f7745 fix unsaveable launched trident PaperMC/Paper@41a094cf move block data/state impl PaperMC/Paper@6b26b219 remove hardcoded durability from material PaperMC/Paper@db8c646d Merge remote-tracking branch 'origin/main' into update/1.21.5
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Wed, 30 Nov 2022 12:56:43 +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/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 45296a3d27ecd70375ea17c1375d05c70f10f9d2..e10e540e5a24552167ab066146cbd0eaead6dc9e 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2994,6 +2994,23 @@ public final class CraftServer implements Server {
|
|
};
|
|
}
|
|
|
|
+ // Gale start - specific interval TPS API
|
|
+ @Override
|
|
+ public double get1MinuteTPSAverage() {
|
|
+ return net.minecraft.server.MinecraftServer.getServer().tps1.getAverage();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public double get5MinuteTPSAverage() {
|
|
+ return net.minecraft.server.MinecraftServer.getServer().tps5.getAverage();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public double get15MinuteTPSAverage() {
|
|
+ return net.minecraft.server.MinecraftServer.getServer().tps15.getAverage();
|
|
+ }
|
|
+ // Gale end - specific interval TPS API
|
|
+
|
|
@Override
|
|
public void playSound(final net.kyori.adventure.sound.Sound sound) {
|
|
if (sound.seed().isEmpty()) org.spigotmc.AsyncCatcher.catchOp("play sound; cannot generate seed with world random");
|