mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-26 18:39:23 +00:00
337a94cda9
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@d1a72ea Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11405) PaperMC/Paper@0a53f1d Set default drop behavior for player deaths (#11380) PaperMC/Paper@951e7dd Fix TrialSpawner forgetting assigned mob when placed by player (#11381) PaperMC/Paper@13a2395 Fix enable-player-collisions playing sounds when set to false (#11390) PaperMC/Paper@1348e44 Prevent NPE when serializing unresolved profile (#11407) Gale Changes: Dreeam-qwq/Gale@f346681 Updated Upstream (Paper) Dreeam-qwq/Gale@bba1737 Updated Upstream (Paper) Purpur Changes: PurpurMC/Purpur@88352c3 Updated Upstream (Paper) PurpurMC/Purpur@dee41bc Updated Upstream (Paper) PurpurMC/Purpur@fdfc12e Updated Upstream (Paper) PurpurMC/Purpur@bc7bcbb Fix elytra durability setting not working properly (#1589) PurpurMC/Purpur@8af4ea6 Updated Upstream (Paper) PurpurMC/Purpur@8332fa4 Updated Upstream (Paper)
44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
Date: Sat, 24 Feb 2024 01:16:07 -0500
|
|
Subject: [PATCH] Including 5s in getTPS()
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index bdecd0fdd56f91072fc2eb5768857a607b40bbb9..72e3db6b666913c20e5435bb606fb506a74458da 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -3112,6 +3112,8 @@ public final class CraftServer implements Server {
|
|
|
|
@Override
|
|
public double[] getTPS() {
|
|
+ if (org.dreeam.leaf.config.modules.misc.Including5sIngetTPS.enabled) return getTPSIncluding5SecondAverage(); // Leaf - Including 5s in getTPS()
|
|
+
|
|
return new double[] {
|
|
net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
|
|
net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
|
|
diff --git a/src/main/java/org/dreeam/leaf/config/modules/misc/Including5sIngetTPS.java b/src/main/java/org/dreeam/leaf/config/modules/misc/Including5sIngetTPS.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..8a7eb25b407296bb0e4c1fcd33c6f4caa27735ec
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/dreeam/leaf/config/modules/misc/Including5sIngetTPS.java
|
|
@@ -0,0 +1,18 @@
|
|
+package org.dreeam.leaf.config.modules.misc;
|
|
+
|
|
+import org.dreeam.leaf.config.ConfigModules;
|
|
+import org.dreeam.leaf.config.EnumConfigCategory;
|
|
+
|
|
+public class Including5sIngetTPS extends ConfigModules {
|
|
+
|
|
+ public String getBasePath() {
|
|
+ return EnumConfigCategory.MISC.getBaseKeyName();
|
|
+ }
|
|
+
|
|
+ public static boolean enabled = true;
|
|
+
|
|
+ @Override
|
|
+ public void onLoaded() {
|
|
+ enabled = config.getBoolean(getBasePath() + ".including-5s-in-get-tps", enabled);
|
|
+ }
|
|
+}
|