Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-03 23:07:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix NBT pieces overriding a block entity during worldgen deadlock

Browse Source 
By checking if the world passed into StructureTemplate's placeInWorld
is not a WorldGenRegion, we can bypass the deadlock entirely.
See https://bugs.mojang.com/browse/MC-246262
This commit is contained in:
etil2jz 2022-04-02 23:29:24 +02:00
parent 3dc8a5ce57
commit f97f51d382
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
paper-server/patches/sources/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java.patch
View File

@ -59,8 +59,16 @@
List<StructureTemplate.StructureBlockInfo> list = placementData.getRandomPalette(this.palettes, pos).blocks(); List<StructureTemplate.StructureBlockInfo> list = placementData.getRandomPalette(this.palettes, pos).blocks();
if ((!list.isEmpty() || !placementData.isIgnoreEntities() && !this.entityInfoList.isEmpty()) && this.size.getX() >= 1 && this.size.getY() >= 1 && this.size.getZ() >= 1) { if ((!list.isEmpty() || !placementData.isIgnoreEntities() && !this.entityInfoList.isEmpty()) && this.size.getX() >= 1 && this.size.getY() >= 1 && this.size.getZ() >= 1) {
@@ -284,6 +306,20 @@ @@ -281,9 +303,27 @@
Clearable.tryClear(tileentity);
if (definedstructure_blockinfo.nbt != null) {
tileentity = world.getBlockEntity(blockposition2);
- Clearable.tryClear(tileentity);
+ // Paper start - Fix NBT pieces overriding a block entity during worldgen deadlock
+ if (!(world instanceof net.minecraft.world.level.WorldGenLevel)) {
+ Clearable.tryClear(tileentity);
+ }
+ // Paper end - Fix NBT pieces overriding a block entity during worldgen deadlock
world.setBlock(blockposition2, Blocks.BARRIER.defaultBlockState(), 20); world.setBlock(blockposition2, Blocks.BARRIER.defaultBlockState(), 20);
} }
+ // CraftBukkit start + // CraftBukkit start
@ -80,7 +88,7 @@
if (world.setBlock(blockposition2, iblockdata, flags)) { if (world.setBlock(blockposition2, iblockdata, flags)) {
j = Math.min(j, blockposition2.getX()); j = Math.min(j, blockposition2.getX());
@@ -296,7 +332,7 @@ @@ -296,7 +336,7 @@
if (definedstructure_blockinfo.nbt != null) { if (definedstructure_blockinfo.nbt != null) {
tileentity = world.getBlockEntity(blockposition2); tileentity = world.getBlockEntity(blockposition2);
if (tileentity != null) { if (tileentity != null) {
@ -89,7 +97,19 @@
definedstructure_blockinfo.nbt.putLong("LootTableSeed", random.nextLong()); definedstructure_blockinfo.nbt.putLong("LootTableSeed", random.nextLong());
} }
@@ -401,7 +437,7 @@ @@ -394,14 +434,18 @@
if (pair1.getSecond() != null) {
tileentity = world.getBlockEntity(blockposition6);
if (tileentity != null) {
- tileentity.setChanged();
+ // Paper start - Fix NBT pieces overriding a block entity during worldgen deadlock
+ if (!(world instanceof net.minecraft.world.level.WorldGenLevel)) {
+ tileentity.setChanged();
+ }
+ // Paper end - Fix NBT pieces overriding a block entity during worldgen deadlock
}
}
}
} }
if (!placementData.isIgnoreEntities()) { if (!placementData.isIgnoreEntities()) {
@ -98,7 +118,7 @@
} }
return true; return true;
@@ -503,11 +539,13 @@ @@ -503,11 +547,13 @@
} }
private static Optional<Entity> createEntityIgnoreException(ServerLevelAccessor world, CompoundTag nbt) { private static Optional<Entity> createEntityIgnoreException(ServerLevelAccessor world, CompoundTag nbt) {
@ -116,7 +136,7 @@
} }
public Vec3i getSize(Rotation rotation) { public Vec3i getSize(Rotation rotation) {
@@ -721,6 +759,11 @@ @@ -721,6 +767,11 @@
nbt.put("entities", nbttaglist3); nbt.put("entities", nbttaglist3);
nbt.put("size", this.newIntegerList(this.size.getX(), this.size.getY(), this.size.getZ())); nbt.put("size", this.newIntegerList(this.size.getX(), this.size.getY(), this.size.getZ()));
@ -128,7 +148,7 @@
return NbtUtils.addCurrentDataVersion(nbt); return NbtUtils.addCurrentDataVersion(nbt);
} }
@@ -760,6 +803,12 @@ @@ -760,6 +811,12 @@
} }
} }
@ -141,7 +161,7 @@
} }
private void loadPalette(HolderGetter<Block> blockLookup, ListTag palette, ListTag blocks) { private void loadPalette(HolderGetter<Block> blockLookup, ListTag palette, ListTag blocks) {
@@ -840,7 +889,7 @@ @@ -840,7 +897,7 @@
public static final class Palette { public static final class Palette {
private final List<StructureTemplate.StructureBlockInfo> blocks; private final List<StructureTemplate.StructureBlockInfo> blocks;
@ -150,7 +170,7 @@
@Nullable @Nullable
private List<StructureTemplate.JigsawBlockInfo> cachedJigsaws; private List<StructureTemplate.JigsawBlockInfo> cachedJigsaws;
@@ -924,7 +973,7 @@ @@ -924,7 +981,7 @@
public BlockState stateFor(int id) { public BlockState stateFor(int id) {
BlockState iblockdata = (BlockState) this.ids.byId(id); BlockState iblockdata = (BlockState) this.ids.byId(id);