From 0860727dae4c3583f5e518038922f808946091fc Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 26 Oct 2016 16:05:22 -0500
Subject: [PATCH] Update upstream S

---
 Spigot-API-Patches/0003-Timings-v2.patch      |  8 +++---
 ...bug-logging-to-Timings-enable-setter.patch | 25 +++++++++++++++++++
 work/Spigot                                   |  2 +-
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 Spigot-API-Patches/0040-Add-debug-logging-to-Timings-enable-setter.patch

diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch
index faba525132..9f90c71e63 100644
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 56bac601f45228492f57f6edd5b4daba183343fc Mon Sep 17 00:00:00 2001
+From 3a72f5e0b411d51cf5ec7263a22466214012d08f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -3278,10 +3278,10 @@ index a8f61f2..0000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9b20d5c..54e8a5c 100644
+index 6368f9f..2c6a8f5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1394,6 +1394,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1395,6 +1395,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
@@ -3656,5 +3656,5 @@ index 8d98297..7e89b97 100644
 -    }
  }
 -- 
-2.5.0
+2.10.0.windows.1
 
diff --git a/Spigot-API-Patches/0040-Add-debug-logging-to-Timings-enable-setter.patch b/Spigot-API-Patches/0040-Add-debug-logging-to-Timings-enable-setter.patch
new file mode 100644
index 0000000000..71eebc0bfc
--- /dev/null
+++ b/Spigot-API-Patches/0040-Add-debug-logging-to-Timings-enable-setter.patch
@@ -0,0 +1,25 @@
+From 582c0de7289fb70e00150ae60d41ec6b7730d1c9 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.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 4e5cf35..bef7cf7 100644
+--- a/src/main/java/co/aikar/timings/Timings.java
++++ b/src/main/java/co/aikar/timings/Timings.java
+@@ -128,6 +128,9 @@ 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();
++        }
+     }
+ 
+     /**
+-- 
+2.10.0.windows.1
+
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