Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +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

25
patches/api/0007-Add-tick-times-API.patch
View File

@@ -1,26 +1,27 @@
From cf027551379cf75f6751acda9b3e8d1dc5b75dc1 Mon Sep 17 00:00:00 2001 From 06db9bc6c7dd75c551ed8572bf924e0e6a149067 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:08 -0600 Date: Thu, 30 Jan 2020 00:41:08 -0600
Subject: [PATCH] Add tick times API Subject: [PATCH] Add tick times API
--- ---
src/main/java/org/bukkit/Bukkit.java | 20 ++++++++++++++++++++ src/main/java/org/bukkit/Bukkit.java | 21 +++++++++++++++++++++
src/main/java/org/bukkit/Server.java | 17 +++++++++++++++++ src/main/java/org/bukkit/Server.java | 17 +++++++++++++++++
2 files changed, 37 insertions(+) 2 files changed, 38 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 50415189..36e48723 100644 index 50415189c..8fbda2aee 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1620,4 +1620,24 @@ public final class Bukkit { @@ -1620,4 +1620,25 @@ public final class Bukkit {
public static Server.Spigot spigot() { public static Server.Spigot spigot() {
return server.spigot(); return server.spigot();
} }
+ +
+ // Purpur start + // Purpur start
+ /** + /**
+ * Get the last 100 tick times (in nanos) + * Get a sample of the servers last tick times (in nanos)
+ * @return Last 100 tick times (in nanos) + *
+ * @return A sample of the servers last tick times (in nanos)
+ */ + */
+ @NotNull + @NotNull
+ public static long[] getTickTimes() { + public static long[] getTickTimes() {
@@ -28,7 +29,7 @@ index 50415189..36e48723 100644
+ } + }
+ +
+ /** + /**
+ * Get the average tick time (in millis) of the last 100 ticks + * Get the average tick time (in millis)
+ * + *
+ * @return Average tick time (in millis) + * @return Average tick time (in millis)
+ */ + */
@@ -38,7 +39,7 @@ index 50415189..36e48723 100644
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 248c32b0..c28cc59c 100644 index 248c32b03..7d631ac27 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -1413,4 +1413,21 @@ public interface Server extends PluginMessageRecipient { @@ -1413,4 +1413,21 @@ public interface Server extends PluginMessageRecipient {
@@ -48,15 +49,15 @@ index 248c32b0..c28cc59c 100644
+ +
+ // Purpur start + // Purpur start
+ /** + /**
+ * Get the last 100 tick times (in nanos) + * Get a sample of the servers last tick times (in nanos)
+ * + *
+ * @return Last 100 tick times (in nanos) + * @return A sample of the servers last tick times (in nanos)
+ */ + */
+ @NotNull + @NotNull
+ long[] getTickTimes(); + long[] getTickTimes();
+ +
+ /** + /**
+ * Get the average tick time (in millis) of the last 100 ticks + * Get the average tick time (in millis)
+ * + *
+ * @return Average tick time (in millis) + * @return Average tick time (in millis)
+ */ + */

12
patches/api/0008-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From 9c988f7504d9e12aca27e2835286ef100b5a4b43 Mon Sep 17 00:00:00 2001 From 2c39363f1617d348182d18c4ef1ba4b60e904140 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:18:40 -0500 Date: Sun, 26 May 2019 15:18:40 -0500
Subject: [PATCH] Bring back server name Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
2 files changed, 16 insertions(+) 2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 36e48723..451dc570 100644 index 8fbda2aee..a2cf8e29b 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1622,6 +1622,15 @@ public final class Bukkit { @@ -1622,6 +1622,15 @@ public final class Bukkit {
@@ -26,10 +26,10 @@ index 36e48723..451dc570 100644
+ } + }
+ +
/** /**
* Get the last 100 tick times (in nanos) * Get a sample of the servers last tick times (in nanos)
* @return Last 100 tick times (in nanos) *
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c28cc59c..57bb2dde 100644 index 7d631ac27..92df8f8cd 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -1415,6 +1415,13 @@ public interface Server extends PluginMessageRecipient { @@ -1415,6 +1415,13 @@ public interface Server extends PluginMessageRecipient {
@@ -44,7 +44,7 @@ index c28cc59c..57bb2dde 100644
+ String getServerName(); + String getServerName();
+ +
/** /**
* Get the last 100 tick times (in nanos) * Get a sample of the servers last tick times (in nanos)
* *
-- --
2.24.0 2.24.0

12
patches/api/0012-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From ae537506a49446a9f91e2fec2bfc636debe99fe4 Mon Sep 17 00:00:00 2001 From 4e1039edb300dd6fe96d0879f7e08d8a73f1f844 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:24 -0500 Date: Tue, 23 Jul 2019 10:07:24 -0500
Subject: [PATCH] Implement lagging threshold Subject: [PATCH] Implement lagging threshold
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement lagging threshold
2 files changed, 16 insertions(+) 2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 451dc570..7bdd962b 100644 index a2cf8e29b..220cc96c0 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1631,6 +1631,15 @@ public final class Bukkit { @@ -1631,6 +1631,15 @@ public final class Bukkit {
@@ -26,10 +26,10 @@ index 451dc570..7bdd962b 100644
+ } + }
+ +
/** /**
* Get the last 100 tick times (in nanos) * Get a sample of the servers last tick times (in nanos)
* @return Last 100 tick times (in nanos) *
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 57bb2dde..ca195120 100644 index 92df8f8cd..3714f2f55 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -1422,6 +1422,13 @@ public interface Server extends PluginMessageRecipient { @@ -1422,6 +1422,13 @@ public interface Server extends PluginMessageRecipient {
@@ -44,7 +44,7 @@ index 57bb2dde..ca195120 100644
+ boolean isLagging(); + boolean isLagging();
+ +
/** /**
* Get the last 100 tick times (in nanos) * Get a sample of the servers last tick times (in nanos)
* *
-- --
2.24.0 2.24.0

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> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:24 -0600 Date: Thu, 30 Jan 2020 00:41:24 -0600
Subject: [PATCH] Add tick times API Subject: [PATCH] Add tick times API
--- ---
.../java/net/pl3x/purpur/gui/info/RAMDetails.java | 4 ++-- .../net/minecraft/server/MinecraftServer.java | 2 +-
.../java/org/bukkit/craftbukkit/CraftServer.java | 12 ++++++++++++ .../org/bukkit/craftbukkit/CraftServer.java | 17 +++++++++++++++++
.../java/org/spigotmc/TicksPerSecondCommand.java | 10 ++++++++++ .../org/spigotmc/TicksPerSecondCommand.java | 11 +++++++++++
3 files changed, 24 insertions(+), 2 deletions(-) 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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 00f79e433..845eb1f8c 100644 index cfe3157f0..7a0deeba7 100644
--- a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -15,7 +15,7 @@ import java.util.Locale; @@ -105,7 +105,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
import java.util.Vector; private String motd;
private int G;
public class RAMDetails extends JList<String> { private int H;
- private static final DecimalFormat DECIMAL_FORMAT = SystemUtils.a(new DecimalFormat("########0.000"), (format) - public final long[] f = new long[100]; public long[] getTickTimes() { return f; } // Purpur
+ public static final DecimalFormat DECIMAL_FORMAT = SystemUtils.a(new DecimalFormat("########0.000"), (format) + public final long[] f = new long[100]; public long[] getTickTimes() { return f; } // Purpur - OBFHELPER
-> format.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ROOT))); @Nullable
private KeyPair I;
public RAMDetails() { @Nullable
@@ -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/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java 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 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/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; return net.minecraft.server.MinecraftServer.currentTick;
} }
// Paper end // Paper end
@@ -43,26 +34,39 @@ index daa94187f..ca7cc3b87 100644
+ // Purpur start + // Purpur start
+ @Override + @Override
+ public long[] getTickTimes() { + public long[] getTickTimes() {
+ return getServer().getTickTimes(); + return getServer().getTickTimes().clone();
+ } + }
+ +
+ @Override + @Override
+ public double getAverageTickTime() { + 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 + // Purpur end
} }
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java 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 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
+++ b/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, ", ")); sender.sendMessage( ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " + org.apache.commons.lang.StringUtils.join(tpsAvg, ", "));
// Paper end // Paper end
+ // Purpur start + // Purpur start
+ double avg = org.bukkit.Bukkit.getAverageTickTime(); + 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 + // Purpur end
return true; return true;

12
patches/server/0050-Implement-lagging-threshold.patch
View File

@@ -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> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:16 -0500 Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Implement lagging threshold Subject: [PATCH] Implement lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
3 files changed, 12 insertions(+) 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 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 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/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 @@ -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 double packetRateLimitInterval = 10.0; // seconds
public static String packetRateLimitKickMessage = "Sent too many packets"; 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 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 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/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 { @@ -2205,5 +2205,10 @@ public final class CraftServer implements Server {
public double getAverageTickTime() { }
return net.pl3x.purpur.gui.info.RAMDetails.getAverage(getTickTimes()); return ((double) total / (double) tickTimes.length) * 1.0E-6D;
} }
+ +
+ @Override + @Override

6
patches/server/0056-Bring-back-server-name.patch
View File

@@ -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> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:19:14 -0500 Date: Sun, 26 May 2019 15:19:14 -0500
Subject: [PATCH] Bring back server name 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 spawnNpcs = this.getBoolean("spawn-npcs", true);
public final boolean pvp = this.getBoolean("pvp", 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 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 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/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 { @@ -2191,6 +2191,11 @@ public final class CraftServer implements Server {
@@ -35,7 +35,7 @@ index 0806e87cd..fcfb2c1b0 100644
+ +
@Override @Override
public long[] getTickTimes() { public long[] getTickTimes() {
return getServer().getTickTimes(); return getServer().getTickTimes().clone();
-- --
2.24.0 2.24.0

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

@@ -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> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 28 Jul 2019 01:27:37 -0500 Date: Sun, 28 Jul 2019 01:27:37 -0500
Subject: [PATCH] Add 5 second tps average in /tps 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(-) 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 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 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/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 @@ -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 lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime; tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java 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 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/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 { @@ -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().tps5.getAverage(),
net.minecraft.server.MinecraftServer.getServer().tps15.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 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 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
+++ b/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++) { for ( int i = 0; i < tps.length; i++) {
tpsAvg[i] = format( tps[i] ); tpsAvg[i] = format( tps[i] );
} }