mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-31 20:22:05 -07:00
Updated Upstream (Bukkit/CraftBukkit/Spigot)
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: be1f3344 SPIGOT-7326: Add ClickType#isMouseClick() CraftBukkit Changes: 3b557627c Fix Player#setScoreboard() checking incorrect state 9a21b0b89 SPIGOT-7393: Fix new tile entities not loading Bukkit's PersistentDataContainer Spigot Changes: c62f4bd9 Rebuild patches
This commit is contained in:
@@ -1,48 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Bjarne Koll <git@lynxplay.dev>
|
||||
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);
|
||||
}
|
||||
|
Submodule work/Bukkit updated: fdff0cd477...be1f33449e
Submodule work/CraftBukkit updated: ad6d0cffbe...3b557627cd
Submodule work/Spigot updated: bed8c61f55...c62f4bd99c
Reference in New Issue
Block a user