Skip to content

Fix bundle contents corruption with item obfuscation and shelves #14353

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
kennytv merged 1 commit into from
Oct 5, 2026
Merged

Fix bundle contents corruption with item obfuscation and shelves #14353

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions ...server/src/main/java/io/papermc/paper/util/sanitizer/OversizedItemComponentSanitizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public final class OversizedItemComponentSanitizer {
public static final Codec<ChargedProjectiles> CHARGED_PROJECTILES = codec(ChargedProjectiles.CODEC, OversizedItemComponentSanitizer::sanitizeChargedProjectiles);
public static final StreamCodec<RegistryFriendlyByteBuf, ItemContainerContents> CONTAINER_STREAM = codec(ItemContainerContents.STREAM_CODEC, OversizedItemComponentSanitizer::sanitizeItemContainerContents);
public static final Codec<ItemContainerContents> CONTAINER = codec(ItemContainerContents.CODEC, OversizedItemComponentSanitizer::sanitizeItemContainerContents);
public static final Codec<BundleContents> BUNDLE_CONTENTS = new Codec<>() {
public static final Codec<BundleContents> BUNDLE_CONTENTS = new BundleContentsCodec();
static class BundleContentsCodec implements Codec<BundleContents>, ObfuscationDependantCodec {

@Override
public <T> DataResult<Pair<BundleContents, T>> decode(final DynamicOps<T> ops, final T input) {
Expand All @@ -51,7 +52,8 @@ public <T> DataResult<T> encode(final BundleContents input, final DynamicOps<T>
}
}
};
public static final StreamCodec<RegistryFriendlyByteBuf, BundleContents> BUNDLE_CONTENTS_STREAM = new StreamCodec<>() {
public static final StreamCodec<RegistryFriendlyByteBuf, BundleContents> BUNDLE_CONTENTS_STREAM = new BundleContentsStreamCodec();
static class BundleContentsStreamCodec implements StreamCodec<RegistryFriendlyByteBuf, BundleContents>, ObfuscationDependantCodec {
@Override
public BundleContents decode(final RegistryFriendlyByteBuf buffer) {
return BundleContents.STREAM_CODEC.decode(buffer);
Expand Down
Loading