From ebc0e61be8538183f6bf50eb78cb9c1e36ca5554 Mon Sep 17 00:00:00 2001 From: EnZaXD Date: Sat, 7 Sep 2024 10:45:10 +0200 Subject: [PATCH] Fix invalid book view not visible in 1.20.3->.5 (#4139) --- .../BlockItemPacketRewriter1_20_5.java | 70 ++++++++++++------- 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java index fde9af2f4..476d4e0e2 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java @@ -1163,47 +1163,63 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter pagesTag = tag.getListTag("pages", StringTag.class); - final CompoundTag filteredPagesTag = tag.getCompoundTag("filtered_pages"); - if (pagesTag == null) { - return; + + boolean valid = author != null && title != null && title.length() <= 32 && pagesTag != null; + if (valid) { + for (final StringTag page : pagesTag) { + if (page.getValue().length() > Short.MAX_VALUE) { + valid = false; + break; + } + } } final List pages = new ArrayList<>(); - for (int i = 0; i < pagesTag.size(); i++) { - final StringTag page = pagesTag.get(i); - Tag filtered = null; - if (filteredPagesTag != null) { - final StringTag filteredPage = filteredPagesTag.getStringTag(String.valueOf(i)); - if (filteredPage != null) { - try { - filtered = jsonToTag(connection, filteredPage); - } catch (final Exception e) { - // A 1.20.4 client would display the broken json raw, but a 1.20.5 client would die - continue; + if (valid) { + final CompoundTag filteredPagesTag = tag.getCompoundTag("filtered_pages"); + + for (int i = 0; i < pagesTag.size(); i++) { + final StringTag page = pagesTag.get(i); + Tag filtered = null; + if (filteredPagesTag != null) { + final StringTag filteredPage = filteredPagesTag.getStringTag(String.valueOf(i)); + if (filteredPage != null) { + try { + filtered = jsonToTag(connection, filteredPage); + } catch (final Exception e) { + // A 1.20.4 client would display the broken json raw, but a 1.20.5 client would die + continue; + } } } - } - final Tag parsedPage; - try { - parsedPage = jsonToTag(connection, page); - } catch (final Exception e) { - // Same as above - continue; - } + final Tag parsedPage; + try { + parsedPage = jsonToTag(connection, page); + } catch (final Exception e) { + // Same as above + continue; + } - pages.add(new FilterableComponent(parsedPage, filtered)); + pages.add(new FilterableComponent(parsedPage, filtered)); + } + } else { + final CompoundTag invalidPage = new CompoundTag(); + invalidPage.putString("text", "* Invalid book tag *"); + invalidPage.putString("color", "#AA0000"); // dark red + + pages.add(new FilterableComponent(invalidPage, null)); } - final String title = tag.getString("title", ""); final String filteredTitle = tag.getString("filtered_title"); // Nullable - final String author = tag.getString("author", ""); final int generation = tag.getInt("generation"); final boolean resolved = tag.getBoolean("resolved"); final WrittenBook writtenBook = new WrittenBook( - new FilterableString(limit(title, 32), limit(filteredTitle, 32)), - author, + new FilterableString(limit(title == null ? "" : title, 32), limit(filteredTitle, 32)), + author == null ? "" : author, clamp(generation, 0, 3), pages.toArray(new FilterableComponent[0]), resolved