diff --git a/Spigot-Server-Patches/PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/PortalCreateEvent-needs-to-know-its-entity.patch
index 9e0087b2d4..a94046cbb6 100644
--- a/Spigot-Server-Patches/PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/Spigot-Server-Patches/PortalCreateEvent-needs-to-know-its-entity.patch
@@ -124,11 +124,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
          // Copy below for loop
 @@ -0,0 +0,0 @@ public class BlockPortalShape {
-             blocks.add(state);
+         BlockPosition.a(this.position, this.position.shift(EnumDirection.UP, this.height - 1).shift(this.d, this.width - 1)).forEach((blockposition) -> {
+             blocks.setTypeAndData(blockposition, iblockdata, 18);
          });
- 
--        PortalCreateEvent event = new PortalCreateEvent(blocks, bworld, null, PortalCreateEvent.CreateReason.FIRE);
-+        PortalCreateEvent event = new PortalCreateEvent(blocks, bworld, itemActionContext == null || itemActionContext.getEntity() == null ? null : itemActionContext.getEntity().getBukkitEntity(), PortalCreateEvent.CreateReason.FIRE); // Paper - pass entity param
+-
+-        PortalCreateEvent event = new PortalCreateEvent((java.util.List<org.bukkit.block.BlockState>) (java.util.List) blocks.getList(), bworld, null, PortalCreateEvent.CreateReason.FIRE);
++        PortalCreateEvent event = new PortalCreateEvent((java.util.List<org.bukkit.block.BlockState>) (java.util.List) blocks.getList(), bworld, itemActionContext == null || itemActionContext.getEntity() == null ? null : itemActionContext.getEntity().getBukkitEntity(), PortalCreateEvent.CreateReason.FIRE); // Paper - pass entity param
          this.b.getMinecraftWorld().getMinecraftServer().server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index ebe18b9b0e..3797d93e36 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit ebe18b9b0ea94fcec32accc5132d33fe43923455
+Subproject commit 3797d93e369645c9b2d9ab0188aa893a11280628