Fix BlockData merge for cached states - #14080
Merged
lynxplay merged 1 commit intoJul 26, 2026
Merged
Conversation
ZapolyarnyDev
force-pushed
the
fix/block-data-merge-for-cached-state
branch
from
July 18, 2026 22:25
c422bee to
152e7ed
Compare
electronicboy
approved these changes
Jul 21, 2026
papermc-projects
Bot
moved this from Awaiting review
to Full approval
in Paper PR Queue
lynxplay
approved these changes
Jul 26, 2026
github-project-automation
Bot
moved this from Full approval
to Merged
in Paper PR Queue
hershate
added a commit
to hershate/Papo
that referenced
this pull request
Jul 27, 2026
Cached default-state CraftBlockData instances had parsedStates == null, so BlockData#merge threw 'Data not created via string parsing' even for BlockData obtained via string parsing (e.g. Server#createBlockData). Adapted to 1.21.11 where parsedStates is a Map (upstream 26.1 uses List<Property.Value>) and newData is named fromString upstream.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #14064
Retain
parsedStatesfor preloadedBlockDatacache entries. This allowsmergeto correctly handle fully specified string-createdBlockDataI also added regression tests covering banners and oak logs