diff --git a/Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch
index fa2903fd89..fb43d9e3bb 100644
--- a/Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch
+++ b/Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix nether portal creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
-index 60330f753fcbdef679a9444c3888f1656b2fa344..c22dbbfbe8b16d4c2f1df1f9efd3b06e330ac909 100644
+index 133d0f85e95384fcec622db5b565b57b926c7e2d..37276ac5c5e9160e8703884a02f8d765ce6afc24 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 @@ -38,6 +38,11 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
@@ -19,4 +19,4 @@ index 60330f753fcbdef679a9444c3888f1656b2fa344..c22dbbfbe8b16d4c2f1df1f9efd3b06e
 +        // Paper end
          CraftBlockState state = CraftBlockState.getBlockState(world, position, flag);
          state.setData(data);
-         list.put(position, state);
+         // remove first to keep insertion order
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 6f55b5b888..95544a2da8 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6f55b5b8883b1bd2a8661478e078be359fad1294
+Subproject commit 95544a2da8707a3b3ee758e346da9ab063f1dbb2