diff --git a/Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch
index a77155eac5..90a27b0ffe 100644
--- a/Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch
@@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData
 and cloning it when one is needed.
 
 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index 8ba7718b61ad9f6c8537b44265818ecbcffbfb63..eeeffa989e7024dc345fafda822e0b29f928a759 100644
+index 8bcca73ae48ee822d32a6d23be2e1056a376e5f6..62e7c6cb1b363d1ee626c4405f8c30e74aba03e9 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
 @@ -323,6 +323,14 @@ public abstract class BlockBase {
@@ -26,10 +26,10 @@ index 8ba7718b61ad9f6c8537b44265818ecbcffbfb63..eeeffa989e7024dc345fafda822e0b29
          public void a() {
              if (!this.getBlock().o()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index c7eed6b572cef2c735b1eb2f587c24876047cf94..bbded5671e986be34ebe3100e4c10ee0d5741764 100644
+index 4dc3856cdadc91af227b7ae3f6e9b973d9fd4111..d79946ecc15c7a822267b8fa58323e6c1bc2ab6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -553,7 +553,17 @@ public class CraftBlockData implements BlockData {
+@@ -509,7 +509,17 @@ public class CraftBlockData implements BlockData {
          return craft;
      }
  
diff --git a/Spigot-Server-Patches/0570-Cache-block-data-strings.patch b/Spigot-Server-Patches/0570-Cache-block-data-strings.patch
index 7fab40e29a..2f6d530ed2 100644
--- a/Spigot-Server-Patches/0570-Cache-block-data-strings.patch
+++ b/Spigot-Server-Patches/0570-Cache-block-data-strings.patch
@@ -17,10 +17,10 @@ index 3ef193958e653e7f39d97f11b9778a2242b3c985..dc511024a771a343b0fbebda3492bac2
  
          if (this.isMainThread()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index bbded5671e986be34ebe3100e4c10ee0d5741764..7591159c25899fb7a58b25622c6b7241b788652e 100644
+index d79946ecc15c7a822267b8fa58323e6c1bc2ab6d..f44fc4a95954e0745fbcd6d06b79acc37699c77a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -520,9 +520,39 @@ public class CraftBlockData implements BlockData {
+@@ -476,9 +476,39 @@ public class CraftBlockData implements BlockData {
          Preconditions.checkState(MAP.put(nms, bukkit) == null, "Duplicate mapping %s->%s", nms, bukkit);
      }
  
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 3af81c7179..ce64c84ca8 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 3af81c717980b5e114cb27029e7ee8f1defac841
+Subproject commit ce64c84ca8c959a290a80a7d59b69809dad8206a