diff --git a/Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch deleted file mode 100644 index fb43d9e3bb..0000000000 --- a/Spigot-Server-Patches/0377-Fix-nether-portal-creation.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Himing -Date: Mon, 9 Sep 2019 13:21:17 +1000 -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 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 { - - @Override - public boolean setTypeAndData(BlockPosition position, IBlockData data, int flag) { -+ // Paper start -+ // When a LinkedHashMap entry is overwritten, it keeps its old position. Removing the entry here before adding -+ // a new one ensures that the nether portal blocks are placed last and are not destroyed by physics. -+ list.remove(position); -+ // Paper end - CraftBlockState state = CraftBlockState.getBlockState(world, position, flag); - state.setData(data); - // remove first to keep insertion order