mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-09 21:48:11 +02:00
Upstream has released updates that appear 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: 37262de8 PR-812: Add Registry#match(String) d6b40162 SPIGOT-4569: Add more BlockData API f9691891 PR-809: Throw a more clear error for BlockIterators with zero direction, add Vector#isZero() 91e79e19 PR-804: Added methods to get translation keys for materials, itemstacks and more 426b00d3 PR-795: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 0e91ea52 SPIGOT-7224: Add events for brewing stands and campfires starting their actions CraftBukkit Changes: a50301aa5 Fix issues with fluid tag conversion and fluid #isTagged 6aeb5e4c3 SPIGOT-4569: Implement more BlockData API 7dbf862c2 PR-1131: Added methods to get translation keys for materials, itemstacks and more 7167588b1 PR-1117: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 7c44152eb SPIGOT-7224: Add events for brewing stands and campfires starting their actions
41 lines
2.4 KiB
Diff
41 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: etil2jz <blanchot.arthur@protonmail.ch>
|
|
Date: Sat, 2 Apr 2022 23:29:24 +0200
|
|
Subject: [PATCH] Fix NBT pieces overriding a block entity during worldgen
|
|
deadlock
|
|
|
|
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
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
|
|
index d1bfb95114b733dde9537c4de6bd1bccb696cd18..1d809de3db6c6de64f938f66d81356c5b58967f8 100644
|
|
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
|
|
+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.java
|
|
@@ -267,7 +267,11 @@ public class StructureTemplate {
|
|
|
|
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
|
|
world.setBlock(blockposition2, Blocks.BARRIER.defaultBlockState(), 20);
|
|
}
|
|
|
|
@@ -382,7 +386,11 @@ public class StructureTemplate {
|
|
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
|
|
}
|
|
}
|
|
}
|