Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
From 5945813c901ff9b1ad210e730722daba084c3860 Mon Sep 17 00:00:00 2001
|
|
From: Michael Himing <mhiming@gmail.com>
|
|
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 60330f753f..c22dbbfbe8 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);
|
|
list.put(position, state);
|
|
--
|
|
2.25.1
|
|
|