diff --git a/Spigot-Server-Patches/Configurable-cactus-bamboo-and-reed-growth-heights.patch b/Spigot-Server-Patches/Configurable-cactus-bamboo-and-reed-growth-heights.patch
index 9a9af0ff0c..a219a21244 100644
--- a/Spigot-Server-Patches/Configurable-cactus-bamboo-and-reed-growth-heights.patch
+++ b/Spigot-Server-Patches/Configurable-cactus-bamboo-and-reed-growth-heights.patch
@@ -54,8 +54,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              BlockPosition blockposition1 = blockposition.up(i);
              IBlockData iblockdata1 = worldserver.getType(blockposition1);
  
--            if (k >= 16 || (Integer) iblockdata1.get(BlockBamboo.f) == 1 || !worldserver.isEmpty(blockposition1.up())) {
-+            if (k >= worldserver.paperConfig.bambooMaxHeight || (Integer) iblockdata1.get(BlockBamboo.f) == 1 || !worldserver.isEmpty(blockposition1.up())) { // Paper
+-            if (k >= 16 || !iblockdata1.a(Blocks.BAMBOO) || (Integer) iblockdata1.get(BlockBamboo.f) == 1 || !worldserver.isEmpty(blockposition1.up())) { // CraftBukkit - If the BlockSpreadEvent was cancelled, we have no bamboo here
++            if (k >= worldserver.paperConfig.bambooMaxHeight || !iblockdata1.a(Blocks.BAMBOO) || (Integer) iblockdata1.get(BlockBamboo.f) == 1 || !worldserver.isEmpty(blockposition1.up())) { // CraftBukkit - If the BlockSpreadEvent was cancelled, we have no bamboo here // Paper - Configurable cactus bamboo and reed growth heights
                  return;
              }
  
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 9c32a8794c..7eb35643e2 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 9c32a8794ce9fe3782c1e907407b8980a506c56f
+Subproject commit 7eb35643e2ed2fb55732e2ef9e43087f91006fef