Fix avg tick times

patches/server/0048-Add-tick-times-API.patch

@@ -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;

patches/server/0050-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 150bf46cc0a227cd9d96aa4935fe7619ee7b2c9e Mon Sep 17 00:00:00 2001
+From 935800f2fdaad24d8963293baa9377afbfae6db1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:16 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
  3 files changed, 12 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cfe3157f0..39ed2ed61 100644
+index 7a0deeba7..68ba58ef2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -178,6 +178,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -46,12 +46,12 @@ index e791c52a4..2c7791cf6 100644
      public static double packetRateLimitInterval = 10.0; // seconds
      public static String packetRateLimitKickMessage = "Sent too many packets";
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ca7cc3b87..0806e87cd 100644
+index 818ad978f..bcd39220c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2200,5 +2200,10 @@ public final class CraftServer implements Server {
-     public double getAverageTickTime() {
-         return net.pl3x.purpur.gui.info.RAMDetails.getAverage(getTickTimes());
+@@ -2205,5 +2205,10 @@ public final class CraftServer implements Server {
+         }
+         return ((double) total / (double) tickTimes.length) * 1.0E-6D;
      }
 +
 +    @Override

patches/server/0056-Bring-back-server-name.patch

@@ -1,4 +1,4 @@
-From 70dc3e709966424ed6aab1eff5e9f78ec450dc66 Mon Sep 17 00:00:00 2001
+From 9aa2660477e6c65ad2be4a89037d8542a7127115 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:19:14 -0500
 Subject: [PATCH] Bring back server name
@@ -21,7 +21,7 @@ index 0c3ec8357..309f5562b 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0806e87cd..fcfb2c1b0 100644
+index bcd39220c..13dbd63ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2191,6 +2191,11 @@ public final class CraftServer implements Server {
@@ -35,7 +35,7 @@ index 0806e87cd..fcfb2c1b0 100644
 +
      @Override
      public long[] getTickTimes() {
-         return getServer().getTickTimes();
+         return getServer().getTickTimes().clone();
 -- 
 2.24.0
 

patches/server/0070-Add-5-second-tps-average-in-tps.patch

@@ -1,4 +1,4 @@
-From b43861bba4f3a59fd58f7d28e2274aca6673da08 Mon Sep 17 00:00:00 2001
+From 3ea10d3fc917f86782d0fdb8df2815449ebc9bd2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 28 Jul 2019 01:27:37 -0500
 Subject: [PATCH] Add 5 second tps average in /tps
@@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
  3 files changed, 11 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 39ed2ed61..4d72a59d6 100644
+index 68ba58ef2..8bb26f7bf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -177,7 +177,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -52,7 +52,7 @@ index 39ed2ed61..4d72a59d6 100644
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fcfb2c1b0..6f52104f6 100644
+index 13dbd63ff..216ce4d00 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2028,6 +2028,7 @@ public final class CraftServer implements Server {
@@ -64,10 +64,10 @@ index fcfb2c1b0..6f52104f6 100644
                  net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
                  net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index 5550379a6..96c2f17b7 100644
+index b889c32a1..f956d2772 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-@@ -30,7 +30,7 @@ public class TicksPerSecondCommand extends Command
+@@ -31,7 +31,7 @@ public class TicksPerSecondCommand extends Command
          for ( int i = 0; i < tps.length; i++) {
              tpsAvg[i] = format( tps[i] );
          }