mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
d801e88a2a
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@5e2a3bc0 Call EntityChangeBlockEvent with correct block when waxing (#12154) PaperMC/Paper@ab984a07 Always pass event block to damage source (#12158) PaperMC/Paper@7b4d44f5 Revert "Always pass event block to damage source (#12158)" PaperMC/Paper@e5a8ee84 Hide soul speed particles for vanished players (#12152) PaperMC/Paper@fcb2e815 Clear lastSection on game event listener removal PaperMC/Paper@636ae0cd Add missing Paper comments to player movement patch PaperMC/Paper@9be4e07a Pin snapshot dependencies (#12185) PaperMC/Paper@f12d33f0 Track codec writing PaperMC/Paper@1d9b3994 Add config option for failed beehive release cooldowns (#12186) PaperMC/Paper@5f2ee83e Fix first execution of async delayed/repeating tasks being sync (#12166) PaperMC/Paper@b00875f8 Add a method on Registry to get the size (#12182) PaperMC/Paper@ca261090 Don't process empty rcon commands (#12188) PaperMC/Paper@a501c459 Deprecate server config getters (#12189) PaperMC/Paper@7f3d3591 Use MiniMessage#deserialize(String, Pointered) in sendRichMessage for send messages (#12177) PaperMC/Paper@9b9f046f Remove broken code (#12171) PaperMC/Paper@fc56c728 Add methods for Creaking (#12094) PaperMC/Paper@f63dbeaf Fix cancelled HangingPlaceEvent inventory desync (#12161) PaperMC/Paper@9421f223 Make CustomArgumentType use parse(reader,source) (#12191) PaperMC/Paper@0a6e7435 Fix invulnerability damage and armour (#12190) Gale Changes: Dreeam-qwq/Gale@b2c11564 Updated Upstream (Paper) Dreeam-qwq/Gale@a9e4baae Updated Upstream (Paper) Dreeam-qwq/Gale@32a291bc [ci/skip] Update comment Purpur Changes: PurpurMC/Purpur@62cbd47a Updated Upstream (Paper) PurpurMC/Purpur@d41aaca1 Updated Upstream (Paper) PurpurMC/Purpur@3f8e6134 Fix EntityTameEvent not being called when `always-tame-in-creative` option is enabled (#1645) PurpurMC/Purpur@b34d675f fix `zombie_horse.spawn-chance` option not working
20 lines
1022 B
Diff
20 lines
1022 B
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 144e876399dd61396ae5d192182b3be87ec84da0..230e645e215103b6c09fc09e3653e76879a27727 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -3184,6 +3184,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(),
|