From c23377d32165faf2ddb46b76220144b1fe0bffbe Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Wed, 16 Jul 2014 14:11:44 -0500
Subject: [PATCH] Upstream - Classloader changes and interact limiter changes

---
 Bukkit                                                      | 2 +-
 CraftBukkit                                                 | 2 +-
 .../0020-Toggle-for-player-interact-limiter.patch           | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Bukkit b/Bukkit
index d30cb6300..6ce9a7d98 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit d30cb63000a8d49f5afd9ff064631bc3ec507e0a
+Subproject commit 6ce9a7d98672b26146e2b2d4fd7dc79f3d2ca283
diff --git a/CraftBukkit b/CraftBukkit
index 426f936d0..c9f320907 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 426f936d0733eaf14540e1d74b0ef7b7d802c2aa
+Subproject commit c9f320907d8c9649f5f2b33d8a6c37036f318ca9
diff --git a/CraftBukkit-Patches/0020-Toggle-for-player-interact-limiter.patch b/CraftBukkit-Patches/0020-Toggle-for-player-interact-limiter.patch
index 8f09bd8d0..1cca3ece0 100644
--- a/CraftBukkit-Patches/0020-Toggle-for-player-interact-limiter.patch
+++ b/CraftBukkit-Patches/0020-Toggle-for-player-interact-limiter.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Fri, 11 Jul 2014 08:17:00 -0500
+Date: Wed, 16 Jul 2014 14:11:08 -0500
 Subject: [PATCH] Toggle for player interact limiter
 
 
@@ -21,8 +21,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      public void a(PacketPlayInBlockPlace packetplayinblockplace) {
          boolean throttled = false;
--        if (lastPlace != -1 && MinecraftServer.currentTick - lastPlace < 1) {
-+        if (lastPlace != -1 && MinecraftServer.currentTick - lastPlace < 1 && PaperSpigotConfig.interactLimitEnabled) { // PaperSpigot - Allow interact limit to be disabled
+-        if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 5) {
++        if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 5 && PaperSpigotConfig.interactLimitEnabled) {
              throttled = true;
          } else
          {