From 85480c7faa12ce5f29e0bdd1a0da56f7c1108f35 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 18:56:22 +1000 Subject: [PATCH] Fix timings reset throwing off depth. Thanks @Aikar --- Bukkit-Patches/0004-Enchanced-Timings.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Bukkit-Patches/0004-Enchanced-Timings.patch b/Bukkit-Patches/0004-Enchanced-Timings.patch index 28c956ac2..4031ba69c 100644 --- a/Bukkit-Patches/0004-Enchanced-Timings.patch +++ b/Bukkit-Patches/0004-Enchanced-Timings.patch @@ -1,4 +1,4 @@ -From 470fc3682694b37bfe795b505e2cbf91b8f9d437 Mon Sep 17 00:00:00 2001 +From 197ca3eeed436bb69e5b42db246dc8537d796134 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 11:17:05 +1000 Subject: [PATCH] Enchanced Timings @@ -180,10 +180,10 @@ index ea30d83..d905435 100644 eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java new file mode 100644 -index 0000000..b2e94b6 +index 0000000..9fca481 --- /dev/null +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java -@@ -0,0 +1,174 @@ +@@ -0,0 +1,175 @@ +package org.spigotmc; + +import org.bukkit.event.HandlerList; @@ -288,6 +288,7 @@ index 0000000..b2e94b6 + timings.violations += Math.ceil( timings.curTickTotal / 50000000 ); + } + timings.curTickTotal = 0; ++ timings.timingDepth = 0; // incase reset messes this up + } + + for ( Plugin plugin : Bukkit.getPluginManager().getPlugins() )