From 3ac743124ecdb7f219213f7782e61c3eff89339a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 9 Aug 2018 14:14:17 +0100 Subject: [PATCH] re: Fixup improve tick loop patch --- .../0021-Further-improve-server-tick-loop.patch | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch index 0cf127dd31..900851bf42 100644 --- a/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0021-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From fd2388050096e00efb4c5a9c9db2d604ad1aa693 Mon Sep 17 00:00:00 2001 +From f4c7b7aa414803e6f57d9cdaaeb9542609f926e8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,18 +12,9 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c72bdd29d1..c7b0cdaa20 100644 +index c72bdd29d1..9db0540c1f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -76,7 +76,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati - private final List l = Lists.newArrayList(); - public final MethodProfiler methodProfiler = new MethodProfiler(); - private ServerConnection m; // Spigot -- private final ServerPing n = new ServerPing(); -+4 private final ServerPing n = new ServerPing(); - private final Random o = new Random(); - public final DataFixer dataConverterManager; - private String serverIp; @@ -142,7 +142,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati public org.bukkit.command.ConsoleCommandSender console; public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;