mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix timings reset throwing off depth. Thanks @Aikar

Browse source
This commit is contained in:
md_5 2013-08-03 18:56:22 +10:00
parent 381a40a50a
commit 85480c7faa
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Bukkit-Patches/0004-Enchanced-Timings.patch
View file

@ -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 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 11:17:05 +1000 Date: Sun, 2 Jun 2013 11:17:05 +1000
Subject: [PATCH] Enchanced Timings Subject: [PATCH] Enchanced Timings
@ -180,10 +180,10 @@ index ea30d83..d905435 100644
eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); 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 diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
new file mode 100644 new file mode 100644
index 0000000..b2e94b6 index 0000000..9fca481
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
@@ -0,0 +1,174 @@ @@ -0,0 +1,175 @@
+package org.spigotmc; +package org.spigotmc;
+ +
+import org.bukkit.event.HandlerList; +import org.bukkit.event.HandlerList;
@ -288,6 +288,7 @@ index 0000000..b2e94b6
+ timings.violations += Math.ceil( timings.curTickTotal / 50000000 ); + timings.violations += Math.ceil( timings.curTickTotal / 50000000 );
+ } + }
+ timings.curTickTotal = 0; + timings.curTickTotal = 0;
+ timings.timingDepth = 0; // incase reset messes this up
+ } + }
+ +
+ for ( Plugin plugin : Bukkit.getPluginManager().getPlugins() ) + for ( Plugin plugin : Bukkit.getPluginManager().getPlugins() )