From e24ab2a11ff2a9400915c504772fbe2c76384969 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sat, 3 May 2014 23:29:47 +0100
Subject: [PATCH] Upstream merge: Fix ender crystal stack overflow

---
 Bukkit                                                      | 2 +-
 CraftBukkit                                                 | 2 +-
 .../0034-Allow-Disabling-of-Command-TabComplete.patch       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Bukkit b/Bukkit
index b9a0f9759d..aa8336ec6a 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit b9a0f9759d42f49f2ce23524f8f3d9d185fdb260
+Subproject commit aa8336ec6a2981eb577fb07fc8102b8ab4d9987e
diff --git a/CraftBukkit b/CraftBukkit
index 8356f65daa..d550f2fc83 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 8356f65daa8e01bbb33b4c6345b6724ee991502b
+Subproject commit d550f2fc83405340bc1d3a03fadbef3b581c8a55
diff --git a/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-TabComplete.patch
index d3dcb7cd56..3a73c364ba 100644
--- a/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-TabComplete.patch
+++ b/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-TabComplete.patch
@@ -1,14 +1,14 @@
-From 2b8d8eaeba2e003f64678371bfd50d10cdef2634 Mon Sep 17 00:00:00 2001
+From 6032a32dff698ab5eee24a87c19aa6a0dc0f7dda Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f66f764..53be9ae 100644
+index df0a5ac..2bd80ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1598,6 +1598,13 @@ public final class CraftServer implements Server {
+@@ -1602,6 +1602,13 @@ public final class CraftServer implements Server {
      }
  
      public List<String> tabCompleteCommand(Player player, String message) {