From 3709c87cb8487fb042186b2bff8ddf2671294b88 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Thu, 3 Jul 2014 23:21:36 -0500
Subject: [PATCH] Upstream merge - remove movement limit

---
 Bukkit                                        |  2 +-
 CraftBukkit                                   |  2 +-
 ...figurable-movement-limit-restriction.patch | 37 -------------------
 3 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 CraftBukkit-Patches/0023-Configurable-movement-limit-restriction.patch

diff --git a/Bukkit b/Bukkit
index 5a55230..7c0fc96 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 5a5523015148a832f110f0e48ca71bce796edd29
+Subproject commit 7c0fc96e9e10cb703190cf78124fad5ea977807a
diff --git a/CraftBukkit b/CraftBukkit
index 32f89aa..b734927 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 32f89aac85821cc2928d3552bb12bc64ec76b14f
+Subproject commit b734927224f585a1b232a3ce1decb155130eda96
diff --git a/CraftBukkit-Patches/0023-Configurable-movement-limit-restriction.patch b/CraftBukkit-Patches/0023-Configurable-movement-limit-restriction.patch
deleted file mode 100644
index 7e16acd..0000000
--- a/CraftBukkit-Patches/0023-Configurable-movement-limit-restriction.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 52f79efa2f8217c0d3dd35f756f8165ca9a60a2c Mon Sep 17 00:00:00 2001
-From: Zach Brown <Zbob750@live.com>
-Date: Thu, 3 Jul 2014 19:23:27 -0500
-Subject: [PATCH] Configurable movement limit restriction
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 71878e9..c6564b6 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -186,7 +186,7 @@ public class PlayerConnection implements PacketPlayInListener {
- 
-     public void a(PacketPlayInFlying packetplayinflying) {
-         // Spigot start - throttle
--        if ( ++movementPackets >= 5 )
-+        if ( ++movementPackets >= PaperSpigotConfig.movementLimit ) // PaperSpigot - Configurable movement limit restriction
-         {
-             Player player = this.getPlayer();
-             Location curPos = player.getLocation();
-diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-index 7bda065..49bb6a1 100644
---- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-+++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-@@ -135,4 +135,10 @@ public class PaperSpigotConfig
-     {
-         interactLimit = getInt( "settings.player-interaction-limit", 2 );
-     }
-+
-+    public static int movementLimit;
-+    private static void movementLimit()
-+    {
-+        movementLimit = getInt( "settings.player-movement-limit", 5 );
-+    }
- }
--- 
-1.9.1
-