mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 01:17:44 +01:00
Drop unneeded portal patch (#5566)
This commit is contained in:
parent
07a18c4579
commit
51deec726e
@ -1,22 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 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 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
|
Loading…
Reference in New Issue
Block a user