From 31ba2167bd3d493ccf787caccee8c0606a12d53f Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sun, 2 May 2021 18:58:07 +1000
Subject: [PATCH] SPIGOT-6350: Fix wrong portal block place order

By: DerFrZocker <derrieple@gmail.com>
---
 .../org/bukkit/craftbukkit/util/BlockStateListPopulator.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
index 8f77cf482..133d0f85e 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
@@ -40,7 +40,9 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
     public boolean setTypeAndData(BlockPosition position, IBlockData data, int flag) {
         CraftBlockState state = CraftBlockState.getBlockState(world, position, flag);
         state.setData(data);
-        list.put(position, state);
+        // remove first to keep insertion order
+        list.remove(position);
+        list.put(position.immutableCopy(), state);
         return true;
     }