Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix avg tick times

Browse Source
This commit is contained in:
William Blake Galbreath
2020-02-17 20:26:12 -06:00
parent 5e068999e9
commit 0179d5196f
7 changed files with 77 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
patches/server/0048-Add-tick-times-API.patch
View File

@@ -1,41 +1,32 @@
From 155caf4cd63022a8e4e2a6e1651ccd9616fca731 Mon Sep 17 00:00:00 2001
From 1497f7464288f48095bedeb9c7691dcdeec45346 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:24 -0600
Subject: [PATCH] Add tick times API
---
.../java/net/pl3x/purpur/gui/info/RAMDetails.java | 4 ++--
.../java/org/bukkit/craftbukkit/CraftServer.java | 12 ++++++++++++
.../java/org/spigotmc/TicksPerSecondCommand.java | 10 ++++++++++
3 files changed, 24 insertions(+), 2 deletions(-)
.../net/minecraft/server/MinecraftServer.java | 2 +-
.../org/bukkit/craftbukkit/CraftServer.java | 17 +++++++++++++++++
.../org/spigotmc/TicksPerSecondCommand.java | 11 +++++++++++
3 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
index 00f79e433..845eb1f8c 100644
--- a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
+++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
@@ -15,7 +15,7 @@ import java.util.Locale;
import java.util.Vector;
public class RAMDetails extends JList<String> {
- private static final DecimalFormat DECIMAL_FORMAT = SystemUtils.a(new DecimalFormat("########0.000"), (format)
+ public static final DecimalFormat DECIMAL_FORMAT = SystemUtils.a(new DecimalFormat("########0.000"), (format)
-> format.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ROOT)));
public RAMDetails() {
@@ -44,7 +44,7 @@ public class RAMDetails extends JList<String> {
setListData(vector);
}
- private double getAverage(long[] values) {
+ public static double getAverage(long[] values) {
long total = 0L;
for (long value : values) {
total += value;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cfe3157f0..7a0deeba7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -105,7 +105,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
private String motd;
private int G;
private int H;
- public final long[] f = new long[100]; public long[] getTickTimes() { return f; } // Purpur
+ public final long[] f = new long[100]; public long[] getTickTimes() { return f; } // Purpur - OBFHELPER
@Nullable
private KeyPair I;
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index daa94187f..ca7cc3b87 100644
index daa94187f..818ad978f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2189,4 +2189,16 @@ public final class CraftServer implements Server {
@@ -2189,4 +2189,21 @@ public final class CraftServer implements Server {
return net.minecraft.server.MinecraftServer.currentTick;
}
// Paper end
@@ -43,26 +34,39 @@ index daa94187f..ca7cc3b87 100644
+ // Purpur start
+ @Override
+ public long[] getTickTimes() {
+ return getServer().getTickTimes();
+ return getServer().getTickTimes().clone();
+ }
+
+ @Override
+ public double getAverageTickTime() {
+ return net.pl3x.purpur.gui.info.RAMDetails.getAverage(getTickTimes());
+ long total = 0L;
+ long[] tickTimes = getTickTimes();
+ for (long value : tickTimes) {
+ total += value;
+ }
+ return ((double) total / (double) tickTimes.length) * 1.0E-6D;
+ }
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
index 6d21c3269..5550379a6 100644
index 6d21c3269..b889c32a1 100644
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
@@ -32,10 +32,20 @@ public class TicksPerSecondCommand extends Command
@@ -6,6 +6,7 @@ import org.bukkit.command.CommandSender;
public class TicksPerSecondCommand extends Command
{
+ private static final java.text.DecimalFormat DF = new java.text.DecimalFormat("########0.000"); // Purpur
public TicksPerSecondCommand(String name)
{
@@ -32,10 +33,20 @@ public class TicksPerSecondCommand extends Command
}
sender.sendMessage( ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " + org.apache.commons.lang.StringUtils.join(tpsAvg, ", "));
// Paper end
+ // Purpur start
+ double avg = org.bukkit.Bukkit.getAverageTickTime();
+ sender.sendMessage( ChatColor.GOLD + "Average tick time: " + getColor(avg) + net.pl3x.purpur.gui.info.RAMDetails.DECIMAL_FORMAT.format(avg) + " ms");
+ sender.sendMessage( ChatColor.GOLD + "Average tick time: " + getColor(avg) + DF.format(avg) + " ms");
+ // Purpur end
return true;