Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +01:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
41 Zeilen
2.4 KiB
Diff
41 Zeilen
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 4aac9be67a073e60272a68b52c2cda026d4ee28f..30c44b39f9b7a434bb77d6307d2514f2ce9d2857 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
|
|
@@ -266,7 +266,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);
|
|
}
|
|
|
|
@@ -381,7 +385,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
|
|
}
|
|
}
|
|
}
|