From b2ec959ec7bc7c812bc46db8baa0b41bf83940d9 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.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      | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Bukkit b/Bukkit
index d30cb63000..6ce9a7d986 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit d30cb63000a8d49f5afd9ff064631bc3ec507e0a
+Subproject commit 6ce9a7d98672b26146e2b2d4fd7dc79f3d2ca283
diff --git a/CraftBukkit b/CraftBukkit
index 426f936d07..c9f320907d 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 a8188d1dbc..b21e7654bc 100644
--- a/CraftBukkit-Patches/0020-Toggle-for-player-interact-limiter.patch
+++ b/CraftBukkit-Patches/0020-Toggle-for-player-interact-limiter.patch
@@ -1,11 +1,11 @@
-From 0bb13c80b9f334ae95fcaf0cd66aaef7143c884c Mon Sep 17 00:00:00 2001
+From 89d24e2d915b377efa206cdbca29a7e7d6c23c6f Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4f7da33..1657c7c 100644
+index 9a7b256..dd63b9f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -59,6 +59,8 @@ import org.bukkit.inventory.InventoryView;
@@ -21,8 +21,8 @@ index 4f7da33..1657c7c 100644
  
      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
          {