9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-22 00:09:25 +00:00

Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@681c013 Bundle spark (#11093)
PaperMC/Paper@5fee9c6 Move configuration option to a system property
PaperMC/Paper@aa3b356 Improve server startup logging (#11110)
PaperMC/Paper@9aea240 Properly lookup plugin classes when looked up by spark
PaperMC/Paper@7e91a2c Update the bundled spark version
This commit is contained in:
Dreeam
2024-07-21 07:11:14 +08:00
parent d4f0ad7103
commit a4ed88543a
125 changed files with 156 additions and 155 deletions

View File

@@ -0,0 +1,37 @@
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 39f1a7e9125253783e952853347391ab2896b05d..e78b8577818b63b198dda79b8645b995fa8f1261 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3043,6 +3043,24 @@ 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
+
// Paper start - adventure sounds
@Override
public void playSound(final net.kyori.adventure.sound.Sound sound) {