From 16afc3b31c957e8b8abf3522f5210e319e0cc7a7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 1 Feb 2014 18:08:42 +1100 Subject: [PATCH] Add wiki link to /timings on command --- Bukkit-Patches/0004-Enchanced-Timings.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Bukkit-Patches/0004-Enchanced-Timings.patch b/Bukkit-Patches/0004-Enchanced-Timings.patch index c3dacf3c25..1e6d4b6dc1 100644 --- a/Bukkit-Patches/0004-Enchanced-Timings.patch +++ b/Bukkit-Patches/0004-Enchanced-Timings.patch @@ -1,4 +1,4 @@ -From f229e7b81ab44f89a86865d9c8200c20cb1f2aab Mon Sep 17 00:00:00 2001 +From 679c0e51be354c5b317bd29bd2f487199519378e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 11:17:05 +1000 Subject: [PATCH] Enchanced Timings @@ -17,7 +17,7 @@ index fb3c90f..ffbcac1 100644 Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Reload complete."); diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java -index 7c28b75..1bc26c6 100644 +index 7c28b75..e2fdf22 100644 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java @@ -35,7 +35,7 @@ public class TimingsCommand extends BukkitCommand { @@ -29,7 +29,7 @@ index 7c28b75..1bc26c6 100644 this.setPermission("bukkit.command.timings"); } -@@ -46,14 +46,33 @@ public class TimingsCommand extends BukkitCommand { +@@ -46,14 +46,34 @@ public class TimingsCommand extends BukkitCommand { sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage); return false; } @@ -44,6 +44,7 @@ index 7c28b75..1bc26c6 100644 + { + // ( (org.bukkit.plugin.SimplePluginManager) Bukkit.getPluginManager() ).useTimings( true ); + sender.sendMessage( ChatColor.RED + "This command is disabled as it does not produce accurate results. Please enable plugin-profiling in bukkit.yml and restart." ); ++ sender.sendMessage( ChatColor.RED + "Please see http://www.spigotmc.org/wiki/disabled-timings-on-command/ for further information." ); + } else if ( "off".equals( args[0] ) ) + { + ( (org.bukkit.plugin.SimplePluginManager) Bukkit.getPluginManager() ).useTimings( false ); @@ -65,7 +66,7 @@ index 7c28b75..1bc26c6 100644 for (HandlerList handlerList : HandlerList.getHandlerLists()) { for (RegisteredListener listener : handlerList.getRegisteredListeners()) { if (listener instanceof TimedRegisteredListener) { -@@ -61,10 +80,18 @@ public class TimingsCommand extends BukkitCommand { +@@ -61,10 +81,18 @@ public class TimingsCommand extends BukkitCommand { } } } @@ -87,7 +88,7 @@ index 7c28b75..1bc26c6 100644 int index = 0; int pluginIdx = 0; File timingFolder = new File("timings"); -@@ -99,12 +126,15 @@ public class TimingsCommand extends BukkitCommand { +@@ -99,12 +127,15 @@ public class TimingsCommand extends BukkitCommand { totalTime += time; Class eventClass = trl.getEventClass(); if (count > 0 && eventClass != null) { @@ -104,7 +105,7 @@ index 7c28b75..1bc26c6 100644 fileTimings.println( "Sample time " + sampleTime + " (" + sampleTime / 1E9 + "s)" ); // Spigot // Spigot start if ( paste ) -@@ -114,6 +144,7 @@ public class TimingsCommand extends BukkitCommand { +@@ -114,6 +145,7 @@ public class TimingsCommand extends BukkitCommand { } // Spigot end sender.sendMessage("Timings written to " + timings.getPath());