From 122d3d9d43808f2d1b3aa2f32d5c5c697f0dbb46 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Wed, 26 Oct 2016 16:05:22 -0500
Subject: [PATCH] Update upstream S

---
 ...bug-logging-to-Timings-enable-setter.patch | 23 +++++++++++++++++++
 work/Spigot                                   |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 Spigot-API-Patches/Add-debug-logging-to-Timings-enable-setter.patch

diff --git a/Spigot-API-Patches/Add-debug-logging-to-Timings-enable-setter.patch b/Spigot-API-Patches/Add-debug-logging-to-Timings-enable-setter.patch
new file mode 100644
index 0000000000..4aa6d09971
--- /dev/null
+++ b/Spigot-API-Patches/Add-debug-logging-to-Timings-enable-setter.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+Date: Wed, 26 Oct 2016 15:49:28 -0500
+Subject: [PATCH] Add debug logging to Timings enable setter
+
+Potentially temporary, will be merged back into main Timings patch if not.
+`java -Dtimings.throwOnChange=true -jar paperclip.jar`
+
+diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/co/aikar/timings/Timings.java
++++ b/src/main/java/co/aikar/timings/Timings.java
+@@ -0,0 +0,0 @@ public final class Timings {
+     public static void setTimingsEnabled(boolean enabled) {
+         timingsEnabled = enabled;
+         reset();
++        if (Boolean.getBoolean("timings.throwOnChange")) {
++            new RuntimeException("The enable state of timings has been changed to: " + enabled).printStackTrace();
++        }
+     }
+ 
+     /**
+--
\ No newline at end of file
diff --git a/work/Spigot b/work/Spigot
index 850da7e074..72c26058df 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 850da7e0741c8af9a852d495092dc98249162950
+Subproject commit 72c26058df3d4c3a8d2e2b3255d3a032623a01f0