Skip to content

Fix nbt list unwrapping logic #1382

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

Merged
merged 4 commits into from
Nov 4, 2025
Merged

Fix nbt list unwrapping logic #1382

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d030d0
add support for decoding item profile properties from NBT lists, fix …
TheFaser Oct 27, 2025
6c42494
Revert "add support for decoding item profile properties from NBT lis…
TheFaser Oct 30, 2025
47ac4d5
simplify NBT list conversion logic
TheFaser Oct 30, 2025
fade6da
Fix missing tag unwrapping
booky10 Nov 3, 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
20 changes: 14 additions & 6 deletions api/src/main/java/com/github/retrooper/packetevents/protocol/nbt/NBTList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,16 @@ public void addTagOrWrap(NBT tag) {
}
}

private static NBT tryUnwrap(NBTCompound tag) {
if (tag.tags.size() == 1) {
NBT unwrapped = tag.getTagOrNull("");
if (unwrapped != null) {
return unwrapped;
}
}
return tag; // failed to unwrap
}

// vanilla allows heterogeneous lists by wrapping the different
// tag types in a compound tag list
public List<? extends NBT> unwrapTags() {
Expand All @@ -146,12 +156,10 @@ public List<? extends NBT> unwrapTags() {
}
List<NBT> tags = new ArrayList<>(this.tags.size());
for (T tag : this.tags) {
if (!(tag instanceof NBTCompound) || ((NBTCompound) tag).size() != 1) {
continue;
}
NBT wrapped = ((NBTCompound) tag).getTagOrNull("");
if (wrapped != null) {
tags.add(wrapped);
if (tag instanceof NBTCompound) {
tags.add(tryUnwrap((NBTCompound) tag));
} else {
tags.add(tag);
}
}
return tags;
Expand Down