diff --git a/Spigot-Server-Patches/use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/use-CB-BlockState-implementations-for-captured-block.patch
index 8b4fb45e72..1bda3b8737 100644
--- a/Spigot-Server-Patches/use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/use-CB-BlockState-implementations-for-captured-block.patch
@@ -25,8 +25,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
--    public Map<BlockPosition, CapturedBlockState> capturedBlockStates = new HashMap<>();
-+    public Map<BlockPosition, org.bukkit.craftbukkit.block.CraftBlockState> capturedBlockStates = new HashMap<>(); // Paper
+-    public Map<BlockPosition, CapturedBlockState> capturedBlockStates = new java.util.LinkedHashMap<>();
++    public Map<BlockPosition, org.bukkit.craftbukkit.block.CraftBlockState> capturedBlockStates = new java.util.LinkedHashMap<>(); // Paper
      public Map<BlockPosition, TileEntity> capturedTileEntities = new HashMap<>();
      public List<EntityItem> captureDrops;
      public long ticksPerAnimalSpawns;
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 7d31adb5f7..3f572834a6 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 7d31adb5f7e871581044fc8547eb723f4fad6a5d
+Subproject commit 3f572834a632e841cb3fd5db400130097a990c7a