From 529fb86efd0b795a193a4bc569596786b109e245 Mon Sep 17 00:00:00 2001 From: Bjarne Koll Date: Wed, 14 Jun 2023 13:06:50 +0200 Subject: [PATCH] Call BlockEntity#load in new child types (#9340) BlockEntity#load is responsible for loading the pdc data for block entities. Some of the new block entities added by mojang do not call their super method, preventing paper from loading the PDC, which leads to a loss of data. This commit adds the super calls to prevent this. --- ...-BlockEntity-load-in-new-child-types.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 patches/server/Call-BlockEntity-load-in-new-child-types.patch diff --git a/patches/server/Call-BlockEntity-load-in-new-child-types.patch b/patches/server/Call-BlockEntity-load-in-new-child-types.patch new file mode 100644 index 0000000000..b59bb6375e --- /dev/null +++ b/patches/server/Call-BlockEntity-load-in-new-child-types.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Bjarne Koll +Date: Wed, 14 Jun 2023 12:52:29 +0200 +Subject: [PATCH] Call BlockEntity#load in new child types + +BlockEntity#load is responsible for loading the pdc data for block +entities. Some of the new block entities added by mojang do not call +their super method, preventing paper from loading the PDC, which +leads to a loss of data. + +This patch adds the super calls to prevent this. + +diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java +@@ -0,0 +0,0 @@ public class BrushableBlockEntity extends BlockEntity { + + @Override + public void load(CompoundTag nbt) { ++ super.load(nbt); // Paper - invoke super to load additional, bukkit managed data + if (!this.tryLoadLootTable(nbt) && nbt.contains("item")) { + this.item = ItemStack.of(nbt.getCompound("item")); + } +diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java +@@ -0,0 +0,0 @@ public class ChiseledBookShelfBlockEntity extends BlockEntity implements Contain + + @Override + public void load(CompoundTag nbt) { ++ super.load(nbt); // Paper - invoke super to load additional, bukkit managed data + this.items.clear(); + ContainerHelper.loadAllItems(nbt, this.items); + this.lastInteractedSlot = nbt.getInt("last_interacted_slot"); +diff --git a/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java +@@ -0,0 +0,0 @@ public class SculkCatalystBlockEntity extends BlockEntity implements GameEventLi + + @Override + public void load(CompoundTag nbt) { ++ super.load(nbt); // Paper - invoke super to load additional, bukkit managed data + this.catalystListener.sculkSpreader.load(nbt); + } +