Skip to content

Use book packet for both methods #13298

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
AnnotationVisitor wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Use book packet for both methods #13298

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42b21a4
Use book packet for both methods
AnnotationVisitor Nov 12, 2025
1cf0758
resolve book itemstack aswell
AnnotationVisitor Nov 12, 2025
dc9247d
remove space
AnnotationVisitor Nov 12, 2025
1c5f175
use clone
AnnotationVisitor Nov 12, 2025
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
13 changes: 8 additions & 5 deletions paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2959,22 +2959,25 @@ public void openBook(ItemStack book) {
Preconditions.checkArgument(book != null, "ItemStack cannot be null");
Preconditions.checkArgument(book.hasData(DataComponentTypes.WRITTEN_BOOK_CONTENT), "ItemStack must have a 'written_book_content' component");

final ItemStack previousItem = this.getInventory().getItemInMainHand();
this.getInventory().setItemInMainHand(book);
this.getHandle().openItemGui(CraftItemStack.asNMSCopy(book), InteractionHand.MAIN_HAND);
this.getInventory().setItemInMainHand(previousItem);
net.minecraft.world.item.ItemStack bookItem = CraftItemStack.asNMSCopy(book);
ServerPlayer serverPlayer = this.getHandle();
net.minecraft.world.item.component.WrittenBookContent.resolveForItem(bookItem, serverPlayer.createCommandSourceStack(), serverPlayer);
sendBookOpen(bookItem);
}

@Override
public void openBook(final Book book) {
final ItemStack mutatedItem = ItemType.WRITTEN_BOOK.createItemStack(); // dummy item
mutatedItem.setData(DataComponentTypes.WRITTEN_BOOK_CONTENT, WrittenBookContent.writtenBookContent("", "").addPages(book.pages()));
sendBookOpen(CraftItemStack.unwrap(mutatedItem));
}

private void sendBookOpen(net.minecraft.world.item.ItemStack bookItem) {
final net.minecraft.world.item.ItemStack selectedItem = this.getHandle().getInventory().getSelectedItem();
final int slot = this.getHandle().getInventory().getSelectedSlot();
this.getHandle().connection.send(new ClientboundBundlePacket(
List.of(
new ClientboundSetPlayerInventoryPacket(slot, CraftItemStack.unwrap(mutatedItem)),
new ClientboundSetPlayerInventoryPacket(slot, bookItem),
new ClientboundOpenBookPacket(InteractionHand.MAIN_HAND),
new ClientboundSetPlayerInventoryPacket(slot, selectedItem)
)
Expand Down