[1.21.3] Fix for data map serialization #1648
Merged
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.
Closes #1644
Reason for this change is that
RegistryOps.create
wrapsHolderLookup.Provider
s in aHolderLookupAdapter
, which creates a newRegistryInfoLookup
and sets theowner
field to the registry itself (same object instance as thegetter
field), rather than whatever it was during datagen, thereby creating a disconnect between holders (which are bound to the real owner) and the registry lookup (which is now the wrong owner). However,RegistrySetBuilder
uses its own anonymousHolderLookup.Provider
which overridescreateSerializationContext
to return aRegistryOps
with aRegistryInfoLookup
which would obtain the correct owner for the given registry based on how it was built duringRegistrySetBuilder#buildProviderWithContext
.