Update patches to latest 1.21.4 #1

Merged
Chaoscaot merged 242 commits from update/1.21.4 into main 2025-04-23 22:27:11 +02:00
Showing only changes of commit efdcaa25ee - Show all commits

View File

@@ -9,7 +9,7 @@
this.setLootTable(lootTable); this.setLootTable(lootTable);
this.setLootTableSeed(seed); this.setLootTableSeed(seed);
} }
@@ -50,14 +_,15 @@ @@ -50,15 +_,17 @@
default boolean tryLoadLootTable(CompoundTag tag) { default boolean tryLoadLootTable(CompoundTag tag) {
if (tag.contains("LootTable", 8)) { if (tag.contains("LootTable", 8)) {
@@ -25,8 +25,10 @@
- return true; - return true;
+ return this.lootableData() == null; // Paper - only track the loot table if there is chance for replenish + return this.lootableData() == null; // Paper - only track the loot table if there is chance for replenish
} else { } else {
+ setLootTable(null); // Paper - Fix removing loottable from nbt not updating block entity, MC-279196
return false; return false;
} }
}
@@ -69,26 +_,42 @@ @@ -69,26 +_,42 @@
return false; return false;
} else { } else {