SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-07 17:16:57 +10:00
parent fe5a2d46bd
commit 3eb0f032f0
13 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Bukkit-Patches/0004-Enchanced-Timings.patch
View File

@@ -1,4 +1,4 @@
From 197ca3eeed436bb69e5b42db246dc8537d796134 Mon Sep 17 00:00:00 2001
From 945cdf1a3e7eec1f1b2b4ed7c3a7f8d408a76530 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
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 e3777ea..d2f5d29 100644
index 7c28b75..b9c19de 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 {
@@ -87,14 +87,7 @@ index e3777ea..d2f5d29 100644
int index = 0;
int pluginIdx = 0;
File timingFolder = new File("timings");
@@ -99,12 +126,15 @@ public class TimingsCommand extends BukkitCommand {
totalTime += time;
Event event = trl.getEvent();
if (count > 0 && event != null) {
- fileTimings.println(" " + event.getClass().getSimpleName() + (trl.hasMultiple() ? " (and others)" : "") + " Time: " + time + " Count: " + count + " Avg: " + avg);
+ fileTimings.println(" " + event.getClass().getSimpleName() + (trl.hasMultiple() ? " (and others)" : "") + " Time: " + time + " Count: " + count + " Avg: " + avg + " Violations: " + trl.violations); // Spigot
}
}
@@ -105,6 +132,9 @@ public class TimingsCommand extends BukkitCommand {
}
fileTimings.println(" Total time " + totalTime + " (" + totalTime / 1000000000 + "s)");
}
@@ -113,7 +106,7 @@ index e3777ea..d2f5d29 100644
} catch (IOException e) {
} finally {
diff --git a/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java b/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java
index ed25e17..064a320 100644
index d86805b..4b744ea 100644
--- a/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java
+++ b/src/main/java/org/bukkit/plugin/TimedRegisteredListener.java
@@ -11,6 +11,10 @@ import org.bukkit.event.Listener;
@@ -124,7 +117,7 @@ index ed25e17..064a320 100644
+ public long curTickTotal = 0;
+ public long violations = 0;
+ // Spigot end
private Event event;
private Class<? extends Event> eventClass;
private boolean multiple = false;
@@ -20,6 +24,13 @@ public class TimedRegisteredListener extends RegisteredListener {
@@ -132,7 +125,7 @@ index ed25e17..064a320 100644
@Override
public void callEvent(Event event) throws EventException {
+ // Spigot start
+ if ( !org.bukkit.Bukkit.getServer().getPluginManager().useTimings() )
+ if ( org.bukkit.Bukkit.getServer() != null && !org.bukkit.Bukkit.getServer().getPluginManager().useTimings() )
+ {
+ super.callEvent( event );
+ return;
@@ -141,7 +134,7 @@ index ed25e17..064a320 100644
if (event.isAsynchronous()) {
super.callEvent(event);
return;
@@ -33,7 +44,11 @@ public class TimedRegisteredListener extends RegisteredListener {
@@ -34,7 +45,11 @@ public class TimedRegisteredListener extends RegisteredListener {
}
long start = System.nanoTime();
super.callEvent(event);
@@ -153,8 +146,8 @@ index ed25e17..064a320 100644
+ // Spigot end
}
/**
@@ -42,6 +57,10 @@ public class TimedRegisteredListener extends RegisteredListener {
private static Class<?> getCommonSuperclass(Class<?> class1, Class<?> class2) {
@@ -50,6 +65,10 @@ public class TimedRegisteredListener extends RegisteredListener {
public void reset() {
count = 0;
totalTime = 0;