diff --git a/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch
index c02b25502b..a72cc27487 100644
--- a/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch
@@ -38,10 +38,10 @@ index 0182836a801da077ca0e6fcc75e7095454fb2349..17ae6530bda22144866e94e8449220d1
              entitywitch.prepare(worldserver, worldserver.getDamageScaler(entitywitch.getChunkCoordinates()), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null);
              entitywitch.setNoAI(this.isNoAI());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 12ee73413363084e11c75c943606869e678a864a..08dd8d04a2a033c0c3f78e13dd184afaa3dc3b60 100644
+index fb30199e4dc93057941a05e7ae426ec17ced196e..46e808d55cc33abebae387d6ecceef927eab0094 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1085,6 +1085,14 @@ public class CraftEventFactory {
+@@ -1081,6 +1081,14 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch
index cd367d5b77..2d9a73678d 100644
--- a/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch
@@ -18,7 +18,7 @@ index 23d5b7cb1a5cbe3409a0741af08b2fac8d1a58c1..604bdc5ab98071db88ac3e93ebf11869
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 08dd8d04a2a033c0c3f78e13dd184afaa3dc3b60..a5ca8447b1e403b4ad13a03f9104388fd48d6c7e 100644
+index 46e808d55cc33abebae387d6ecceef927eab0094..e2b7886e63ab60110af9d01f2b8b86b7a9f79bc6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -123,6 +123,7 @@ import org.bukkit.entity.ThrownPotion;
@@ -29,7 +29,7 @@ index 08dd8d04a2a033c0c3f78e13dd184afaa3dc3b60..a5ca8447b1e403b4ad13a03f9104388f
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
  import org.bukkit.event.Event.Result;
-@@ -1044,6 +1045,17 @@ public class CraftEventFactory {
+@@ -1040,6 +1041,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch
index ff1d03884e..291246a15d 100644
--- a/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch
@@ -71,10 +71,10 @@ index 7391fd31148dbde60e34955841a296f454ac768e..53a8ea7d1eff84abe6c49464d556aa27
  
          this.checkBlockCollisions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a5ca8447b1e403b4ad13a03f9104388fd48d6c7e..dc8186b38930bf32f140a2da822cf359b6004a12 100644
+index e2b7886e63ab60110af9d01f2b8b86b7a9f79bc6..848fc157dc8f22c793a523975066523424a92273 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1189,6 +1189,16 @@ public class CraftEventFactory {
+@@ -1185,6 +1185,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
diff --git a/Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch
index 280b3e27b2..50565b5c0a 100644
--- a/Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch
@@ -18,15 +18,15 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e4c4ff9de1f8c86c96baaca7aacbb0e0412ba50a..275442e07743e4e4e3f1468f58c50bb38ab7537a 100644
+index 07db411fb01384bb9f43372f0e83eca05838c00d..aefdcbeb1a452871a5a7376b4c259b3284f10d75 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -71,7 +71,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
      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/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
index 7bcb8b4600..922400ee4a 100644
--- a/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
@@ -101,7 +101,7 @@ index f6d650ca21cef8961e88e07d767478eeb5ec15d1..5efc9dcafc3bbf5c1071ca12f1bd4413
          this.player.o();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c17245bd2016507cce1cac087e03d3b0f4ee6043..8c77970d848b9628ddc4c66679d7ba8044641173 100644
+index ea7527b16571cef5c285e898f5a9fd0c063948fa..df8a92b082139c84afc32cf02541faa82c914d4f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -420,7 +420,7 @@ public abstract class PlayerList {
@@ -136,7 +136,7 @@ index f841621a7fe1a2364f821ceb661972d6b03b3b9a..d1699502eac193f25d2fc369526596a0
          }
          // Spigot End
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 41f6bc1c2c9307c21757555536b035547986c1ab..af95aff8b0252917dd324faadf0dbc773cb38ba6 100644
+index a1c318aa6501d9d0bdd53dc1fb8a99b7a782b4ce..51dce3aa8184b6f7566e29bf8e0285864f9b3a7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -436,8 +436,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -168,10 +168,10 @@ index 23889ce169baf956cfb39f1ec21a8369f80c5555..25175230583bbd6fcfc864dcbae4111d
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0be27ad341ef59184d6c9f171e5e9f5a23d81f15..59bcf19d6c73ccc8f590a391b417f49178822cee 100644
+index 81fc5bcb24e94500bea1a78a369f6fd58865700e..fe88f7e62e547b9aa4ff273341aaee9209aed82b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1339,12 +1339,22 @@ public class CraftEventFactory {
+@@ -1335,12 +1335,22 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0251-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0251-Vanished-players-don-t-have-rights.patch
index 9d5df0dfaa..a0b523c023 100644
--- a/Spigot-Server-Patches/0251-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0251-Vanished-players-don-t-have-rights.patch
@@ -17,7 +17,7 @@ index e7052aba9d63a296873044623808e003b3b453b7..916fb9b063f061d64da1c2ade1863a84
              return this.getBlock().c(this.p(), iblockaccess, blockposition, voxelshapecollision);
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b1d7c30690e09f60075b9d2cff47d6a53115118b..90f5d8c9d04463d65bf8ab936b07d829b2b9f55d 100644
+index 38a0a9313e46ce1f53fa48e99ad501b65deb1342..003f2a3bca8db71d25101b555ada81544e319425 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -100,7 +100,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -96,7 +96,7 @@ index ed0f9c5d29c4f88b7beee4b0ecdd7a56de2d7a9e..881cea7c466f29ff4a89db28d104e850
          if (operatorboolean.apply(false, false)) {
              throw (IllegalArgumentException) SystemUtils.c((Throwable) (new IllegalArgumentException()));
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6202788306bea557c4699698a61c9336eb63a55d..5e6aa9cd63a103b9460c221a3e6c1e431d209d36 100644
+index 7cacffaab40d47f6fdd53bb526e9146a33f2ebc4..b7380f2ef554dc5f562340b7c59fd23cd1f271c1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -178,6 +178,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -147,10 +147,10 @@ index 6202788306bea557c4699698a61c9336eb63a55d..5e6aa9cd63a103b9460c221a3e6c1e43
      public boolean s_() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 59bcf19d6c73ccc8f590a391b417f49178822cee..108289ba7ac5fdf08229bb23059847a178910695 100644
+index fe88f7e62e547b9aa4ff273341aaee9209aed82b..fe8f149ad376b737c798d296ec77beef2362f7e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1210,6 +1210,14 @@ public class CraftEventFactory {
+@@ -1206,6 +1206,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
diff --git a/Spigot-Server-Patches/0530-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0530-Add-PrepareResultEvent.patch
index 767c4e6c46..8c10749fdf 100644
--- a/Spigot-Server-Patches/0530-Add-PrepareResultEvent.patch
+++ b/Spigot-Server-Patches/0530-Add-PrepareResultEvent.patch
@@ -106,10 +106,10 @@ index c9505513e7e34637f8eebd68d756834479c1ca0c..5351bf137623a8909fea672c96a6057c
  
      private void a(IInventory iinventory, ItemStack itemstack) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 32202eb92207995b621d151481aa44bd3817e808..68e3d297876f356594d2df7d5ba72d70dd563e99 100644
+index 5dfd474e425d5a41cbb12ccf4567b44c32e114b3..035e9d466bdaf40d07ac2e4a2d5da66c740c3a76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1553,19 +1553,44 @@ public class CraftEventFactory {
+@@ -1549,19 +1549,44 @@ public class CraftEventFactory {
          return event;
      }
  
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