9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-27 10:39:12 +00:00

Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3b45454 Port random ticking optimisation from Moonrise
PaperMC/Paper@77fcb29 Apply incremental player/level saving patch
PaperMC/Paper@9fd7710 Apply automatic regionfile header recalculation patch
PaperMC/Paper@b57b24d Do not try to stop main thread during watchdog shutdown
This commit is contained in:
Dreeam
2024-07-16 04:58:59 +08:00
parent 655a887c4c
commit c38b773dc4
105 changed files with 140 additions and 168 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 345ed802752639a490378bdb7fe6088f9b42f6a1..25228533084ffd9d9c82fecea8722ea6c1ee4bd3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3030,6 +3030,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) {