From 0febdc8b449d9fd19f693a2129eea20a9233c363 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 2 Aug 2015 01:56:08 -0500 Subject: [PATCH] Rebuild patches --- Spigot-API-Patches/0005-Add-getTPS-method.patch | 8 ++++---- .../0002-PaperSpigot-config-files.patch | 12 ++++++------ .../0028-Further-improve-server-tick-loop.patch | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Spigot-API-Patches/0005-Add-getTPS-method.patch b/Spigot-API-Patches/0005-Add-getTPS-method.patch index c9f4325..b9c90cf 100644 --- a/Spigot-API-Patches/0005-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0005-Add-getTPS-method.patch @@ -1,14 +1,14 @@ -From bd975a633175f8370377c775a4f2ac6192ea7bd9 Mon Sep 17 00:00:00 2001 +From 8bce4a508162d640c99efa7ddde38c1fe773d49e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 19 Oct 2014 18:22:18 -0500 Subject: [PATCH] Add getTPS method diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d9ad0ca..a7fafb2 100644 +index 169008a..26acdda 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -944,6 +944,13 @@ public interface Server extends PluginMessageRecipient { +@@ -956,6 +956,13 @@ public interface Server extends PluginMessageRecipient { public void restart() { throw new UnsupportedOperationException("Not supported yet."); } @@ -23,5 +23,5 @@ index d9ad0ca..a7fafb2 100644 Spigot spigot(); -- -1.9.5.msysgit.1 +2.5.0 diff --git a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch index ce00cab..3447971 100644 --- a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch +++ b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch @@ -1,11 +1,11 @@ -From a898a29d702635a9a745cde1c263de3f0dadbc1d Mon Sep 17 00:00:00 2001 +From a47bb6f79e5625beba2876cb3f3d72dba15add9e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 May 2015 00:08:15 -0500 Subject: [PATCH] PaperSpigot config files diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 7a8ce4a..9975f18 100644 +index 8dd4ef1..6dfb161 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -177,6 +177,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -41,10 +41,10 @@ index 0271b19..822ddeb 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index df34ddc..8b4fc89 100644 +index f57c785..5ce0d50 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -687,6 +687,7 @@ public final class CraftServer implements Server { +@@ -688,6 +688,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot @@ -52,7 +52,7 @@ index df34ddc..8b4fc89 100644 for (WorldServer world : console.worlds) { world.worldData.setDifficulty(difficulty); world.setSpawnFlags(monsters, animals); -@@ -702,12 +703,14 @@ public final class CraftServer implements Server { +@@ -703,12 +704,14 @@ public final class CraftServer implements Server { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } world.spigotConfig.init(); // Spigot @@ -317,5 +317,5 @@ index 0000000..f3bc3aa + } +} -- -1.9.5.msysgit.1 +2.5.0 diff --git a/Spigot-Server-Patches/0028-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0028-Further-improve-server-tick-loop.patch index 3e296f2..eb67aca 100644 --- a/Spigot-Server-Patches/0028-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0028-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From a034823848869c3e53707f9c30a9df2ce171db27 Mon Sep 17 00:00:00 2001 +From a745f29f464ae96eaee025dbb9de05d3b3f936bb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 03:47:32 -0500 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ 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 1061088..0e88078 100644 +index f42b95c..76ba101 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -111,17 +111,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -154,10 +154,10 @@ index 1061088..0e88078 100644 lastTick = curTime; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8b4fc89..ca9c4a9 100644 +index 5ce0d50..97a53d3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1698,6 +1698,17 @@ public final class CraftServer implements Server { +@@ -1704,6 +1704,17 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { @@ -216,5 +216,5 @@ index be2e31d..21fd7ef 100644 return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); -- -2.4.5.windows.1 +2.5.0