From 8e62fb709b7499c46b28341c8c8621450740632c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 15 May 2016 17:34:26 -0400
Subject: [PATCH] Timings v2: Start methods return self for use in
 try-with-resources

try (Timing ignored = timing) {
  // Code to time
}
// auto stops timing, even if you return in 42 other places in the block
---
 Spigot-API-Patches/Timings-v2.patch | 32 +++++++++++++++--------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/Spigot-API-Patches/Timings-v2.patch b/Spigot-API-Patches/Timings-v2.patch
index 4d91ca2d58..9229ca9b8a 100644
--- a/Spigot-API-Patches/Timings-v2.patch
+++ b/Spigot-API-Patches/Timings-v2.patch
@@ -27,13 +27,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
-+    public void startTiming() {
++    public Timing startTiming() {
 +        if (TimingsManager.needsFullReset) {
 +            TimingsManager.resetTimings();
 +        } else if (TimingsManager.needsRecheckEnabled) {
 +            TimingsManager.recheckEnabled();
 +        }
-+        super.startTiming();
++        return super.startTiming();
 +    }
 +
 +    @Override
@@ -122,8 +122,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +public final class NullTimingHandler implements Timing {
 +    @Override
-+    public void startTiming() {
-+
++    public Timing startTiming() {
++        return this;
 +    }
 +
 +    @Override
@@ -132,8 +132,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
-+    public void startTimingIfSync() {
-+
++    public Timing startTimingIfSync() {
++        return this;
 +    }
 +
 +    @Override
@@ -281,21 +281,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    /**
 +     * Starts timing the execution until {@link #stopTiming()} is called.
 +     */
-+    public void startTiming();
++    Timing startTiming();
 +
 +    /**
 +     * <p>Stops timing and records the data. Propagates the data up to group handlers.</p>
 +     *
 +     * Will automatically be called when this Timing is used with try-with-resources
 +     */
-+    public void stopTiming();
++    void stopTiming();
 +
 +    /**
 +     * Starts timing the execution until {@link #stopTiming()} is called.
 +     *
 +     * But only if we are on the primary thread.
 +     */
-+    public void startTimingIfSync();
++    Timing startTimingIfSync();
 +
 +    /**
 +     * <p>Stops timing and records the data. Propagates the data up to group handlers.</p>
@@ -304,12 +304,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *
 +     * But only if we are on the primary thread.
 +     */
-+    public void stopTimingIfSync();
++    void stopTimingIfSync();
 +
 +    /**
 +     * Stops timing and disregards current timing data.
 +     */
-+    public void abort();
++    void abort();
 +
 +    /**
 +     * Used internally to get the actual backing Handler in the case of delegated Handlers
@@ -523,10 +523,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
-+    public void startTimingIfSync() {
++    public Timing startTimingIfSync() {
 +        if (Bukkit.isPrimaryThread()) {
 +            startTiming();
 +        }
++        return this;
 +    }
 +
 +    @Override
@@ -536,12 +537,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +
-+    public void startTiming() {
++    public Timing startTiming() {
 +        if (enabled && ++timingDepth == 1) {
 +            start = System.nanoTime();
 +            parent = TimingsManager.CURRENT;
 +            TimingsManager.CURRENT = this;
 +        }
++        return this;
 +    }
 +
 +    public void stopTiming() {
@@ -2167,9 +2169,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
-+    public void startTiming() {
++    public Timing startTiming() {
 +        checkThread();
-+        super.startTiming();
++        return super.startTiming();
 +    }
 +
 +    @Override