Skip to content

Fix three jukebox item bugs in pipes #1372

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
RasmusKD wants to merge 2 commits into
base: master
Choose a base branch
from
+22 −13
Open

Fix three jukebox item bugs in pipes #1372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1988d9e
Fix jukebox disc duplication and item loss in pipes
RasmusKD Aug 2, 2026
3e1006c
Fix pipes destroying the disc in a playing jukebox
RasmusKD Aug 2, 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
35 changes: 22 additions & 13 deletions src/main/java/com/sk89q/craftbook/mechanics/pipe/Pipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,21 @@ private void searchNearbyPipes(Block block, Set<Vector> visitedPipes, List<ItemS
} else if (fac.getType() == Material.JUKEBOX) {
Jukebox juke = (Jukebox) fac.getState();
List<ItemStack> its = new ArrayList<>(event.getItems());
if (juke.getPlaying() != Material.AIR) {
// Only an empty jukebox accepts a disc. The test was inverted, so
// an empty jukebox never took one, and a playing one had its disc
// overwritten by setPlaying and destroyed. Discs that do not fit
// stay in the list and flow on through the pipe.
if (juke.getPlaying() == Material.AIR) {
Iterator<ItemStack> iter = its.iterator();
while (iter.hasNext()) {
ItemStack st = iter.next();
if (!st.getType().isRecord()) continue;
juke.setPlaying(st.getType());
juke.update();
iter.remove();
if (st.getAmount() > 1)
st.setAmount(st.getAmount() - 1);
else
iter.remove();
break;
}
}
Expand Down Expand Up @@ -429,28 +436,30 @@ private void startPipe(Block block, List<ItemStack> items, boolean request) {
Jukebox juke = (Jukebox) fac.getState();

if (juke.getPlaying() != Material.AIR) {
// Remove the disc before firing the event. Inferring "the disc left
// the jukebox" from the item list afterwards duplicated the disc
// whenever delivery was refused: a copy dropped at the piston while
// the original kept playing.
items.add(new ItemStack(juke.getPlaying()));
juke.setPlaying(Material.AIR);
juke.update();
}

if (!items.isEmpty()) {
PipeSuckEvent event = new PipeSuckEvent(block, new ArrayList<>(items), fac);
Bukkit.getPluginManager().callEvent(event);
items.clear();
items.addAll(event.getItems());

if (!event.isCancelled()) {
if (!event.isCancelled() && !items.isEmpty()) {
visitedPipes.add(fac.getLocation().toVector());
searchNearbyPipes(block, visitedPipes, items);
}

if (!items.isEmpty()) {
for (ItemStack item : items) {
if (!ItemUtil.isStackValid(item)) continue;
block.getWorld().dropItem(BlockUtil.getBlockCentre(block), item);
}
} else {
juke.setPlaying(Material.AIR);
juke.update();
}
}
// Route undelivered items through leftovers like the other branches;
// this was the only branch that never fed it, so an empty jukebox
// destroyed any items a request delivered into it.
leftovers.addAll(items);
} else {
PipeSuckEvent event = new PipeSuckEvent(block, new ArrayList<>(items), fac);
Bukkit.getPluginManager().callEvent(event);
Expand Down
Loading