7 files changed, 2 insertions, 50 deletions
diff --git a/patches/server/0945-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0945-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
index 8c7b5d3b37..9f3b11aee1 100644
--- a/patches/server/0945-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
+++ b/patches/server/0945-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix chiseled bookshelf and jukebox setItem with air
 
 
 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 1714102815e6c32bc161e88b1634f7a80908850a..47e194ef4e75f95573b40ff9f1a11810381cfce8 100644
+index 1f09eaa36b670212f6f02569de3312ad0382493e..4fb5328855fe0700fbc997b9801ef2e1c14c8c8f 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
-@@ -146,7 +146,7 @@ public class ChiseledBookShelfBlockEntity extends BlockEntity implements Contain
+@@ -147,7 +147,7 @@ public class ChiseledBookShelfBlockEntity extends BlockEntity implements Contain
  
      @Override
      public void setItem(int slot, ItemStack stack) {
diff --git a/patches/server/0974-Call-BlockEntity-load-in-new-child-types.patch b/patches/server/0974-Call-BlockEntity-load-in-new-child-types.patch
deleted file mode 100644
index 70f5e22323..0000000000
--- a/patches/server/0974-Call-BlockEntity-load-in-new-child-types.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Bjarne Koll <[email protected]>
-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 14ddb953176b02e7ac68401c5c03120f920739a1..7a3ac883be4015d41a4c7582341a424b4bd6bbf4 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
-@@ -239,6 +239,7 @@ 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 47e194ef4e75f95573b40ff9f1a11810381cfce8..200b8b89403f61f7a3180d3d111c54453816a768 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
-@@ -92,6 +92,7 @@ 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 dfcc141dec0ff6e7704af8852a65783558398a67..a606aed406551f4d3cc0bf09d6e231d87fe00f53 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
-@@ -42,6 +42,7 @@ 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);
-     }
- 
diff --git a/patches/server/0975-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0974-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 9df3133e61..9df3133e61 100644
--- a/patches/server/0975-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0974-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0976-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0975-fix-MapLike-spam-for-missing-key-selector.patch
index 0dcf015d42..0dcf015d42 100644
--- a/patches/server/0976-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0975-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/work/Bukkit b/work/Bukkit
-Subproject fdff0cd477bff16874060e6ebb82671955c04e7
+Subproject be1f33449ea205e494a7bcf2e9322319c616620
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject ad6d0cffbeeddfa1e16574b2df0e575b7e037c8
+Subproject 3b557627cd8274a4a2b16375886c492964db38e
diff --git a/work/Spigot b/work/Spigot
-Subproject bed8c61f55c6af77ae202c57842de8899bc8a59
+Subproject c62f4bd99c6f565026bdba8eabb941b0c58a19d