Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse Source 
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:
Nassim Jahnke 2023-06-16 13:32:29 +02:00
parent 4de304b9eb
commit f0e193c3d1
4 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
patches/server/Call-BlockEntity-load-in-new-child-types.patch
View File

@ -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);
}

2
work/Bukkit

@ -1 +1 @@
Subproject commit fdff0cd477bff16874060e6ebb82671955c04e78
Subproject commit be1f33449ea205e494a7bcf2e9322319c6166204

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit ad6d0cffbeeddfa1e16574b2df0e575b7e037c8e
Subproject commit 3b557627cd8274a4a2b16375886c492964db38eb

2
work/Spigot

@ -1 +1 @@
Subproject commit bed8c61f55c6af77ae202c57842de8899bc8a59b
Subproject commit c62f4bd99c6f565026bdba8eabb941b0c58a19d8