Skip to content

Properly remove items from shelves #13567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lulu13022002 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Properly remove items from shelves #13567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d23fa5
Properly remove items from shelves
Lulu13022002 Jan 19, 2026
4886980
simplify jukebox inventory too and fix NPE for unplaced jukebox
Lulu13022002 Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion paper-api/src/main/java/org/bukkit/block/ChiseledBookshelf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.bukkit.block;

import org.bukkit.inventory.BlockInventoryHolder;
import org.bukkit.inventory.ChiseledBookshelfInventory;
import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
Expand Down
8 changes: 8 additions & 0 deletions ...rver/patches/sources/net/minecraft/world/level/block/entity/JukeboxBlockEntity.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@
public static final String SONG_ITEM_TAG_ID = "RecordItem";
public static final String TICKS_SINCE_SONG_STARTED_TAG_ID = "ticks_since_song_started";
private ItemStack item = ItemStack.EMPTY;
@@ -114,6 +_,7 @@
@Override
public void setTheItem(ItemStack item) {
this.item = item;
+ if (this.level == null) return; // Paper - for unplaced block state
boolean flag = !this.item.isEmpty();
Optional<Holder<JukeboxSong>> optional = JukeboxSong.fromStack(this.level.registryAccess(), this.item);
this.notifyItemChangedInJukebox(flag);
@@ -133,7 +_,7 @@

@Override
Expand Down
13 changes: 0 additions & 13 deletions ...erver/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryChiseledBookshelf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,11 @@
import net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity;
import org.bukkit.block.ChiseledBookshelf;
import org.bukkit.inventory.ChiseledBookshelfInventory;
import org.bukkit.inventory.ItemStack;

public class CraftInventoryChiseledBookshelf extends CraftInventory implements ChiseledBookshelfInventory {

public CraftInventoryChiseledBookshelf(ChiseledBookShelfBlockEntity inventory) {
super(inventory);

}

@Override
public void setItem(int index, ItemStack item) {
net.minecraft.world.item.ItemStack nms = CraftItemStack.asNMSCopy(item);

if (nms.isEmpty()) {
this.getInventory().removeItemNoUpdate(index);
} else {
this.getInventory().setItem(index, nms);
}
}

@Override
Expand Down
10 changes: 3 additions & 7 deletions paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryJukebox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
package org.bukkit.craftbukkit.inventory;

import net.minecraft.world.Container;
import net.minecraft.world.level.block.entity.JukeboxBlockEntity;
import org.bukkit.block.Jukebox;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.JukeboxInventory;

public class CraftInventoryJukebox extends CraftInventory implements JukeboxInventory {

public CraftInventoryJukebox(Container inventory) {
public CraftInventoryJukebox(JukeboxBlockEntity inventory) {
super(inventory);
}

@Override
public void setRecord(ItemStack item) {
if (item == null) {
this.inventory.removeItem(0, 0);
} else {
this.setItem(0, item);
}
this.setItem(0, item);
}

@Override
Expand Down
12 changes: 0 additions & 12 deletions paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryShelf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import net.minecraft.world.level.block.entity.ShelfBlockEntity;
import org.bukkit.block.Shelf;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.ShelfInventory;

public class CraftInventoryShelf extends CraftInventory implements ShelfInventory {
Expand All @@ -11,17 +10,6 @@ public CraftInventoryShelf(ShelfBlockEntity inventory) {
super(inventory);
}

@Override
public void setItem(int index, ItemStack item) {
net.minecraft.world.item.ItemStack nms = CraftItemStack.asNMSCopy(item);

if (nms.isEmpty()) {
this.getInventory().removeItemNoUpdate(index);
} else {
this.getInventory().setItem(index, nms);
}
}

@Override
public Shelf getHolder() {
return (Shelf) this.inventory.getOwner();
Expand Down
Loading