From 0b16cce6e66de3bfb0cc78dc2db912dc49bddefd Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sun, 24 Sep 2023 13:09:52 +1000 Subject: [PATCH] Drop no longer needed patch --- build.gradle.kts | 2 +- ...okshelf-and-jukebox-setItem-with-air.patch | 36 ------------------- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 patches/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/build.gradle.kts b/build.gradle.kts index 01a67d8599..f787dbc00e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -133,7 +133,7 @@ allprojects { tasks.collectAtsFromPatches { // Uncomment while updating for a new Minecraft version - extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) + // extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) } // Uncomment while updating for a new Minecraft version diff --git a/patches/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch deleted file mode 100644 index 0bfad93a05..0000000000 --- a/patches/server/Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke -Date: Sat, 18 Mar 2023 18:51:33 +0100 -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 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 setItem(int slot, ItemStack stack) { -- if (stack.is(ItemTags.BOOKSHELF_BOOKS)) { -+ if (stack.isEmpty() || stack.is(ItemTags.BOOKSHELF_BOOKS)) { // Paper - this.items.set(slot, stack); - if (level != null) this.updateState(slot); // CraftBukkit - SPIGOT-7381: check for null world - } else if (stack.isEmpty()) { -diff --git a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java -@@ -0,0 +0,0 @@ public class JukeboxBlockEntity extends BlockEntity implements Clearable, Contai - - @Override - public void setItem(int slot, ItemStack stack) { -+ // Paper start -+ if (stack.isEmpty()) { -+ this.removeItem(slot, 0); -+ return; -+ } -+ // Paper end - if (stack.is(ItemTags.MUSIC_DISCS) && this.level != null) { - this.items.set(slot, stack); - this.setHasRecordBlockState((Entity) null, true);