Fix NBT stripping and trimming #2929
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.
Overview
Fixes #2928
Description
IBlocks#getEntities()andIBlocks#getTiles()returned mutable collections before #2883, which FAWE depends on when trimming or stripping NBT data. After the change,getEntities()still returns a mutable set which does not reflect changes to the original set, andgetTiles()returns an immutable view of the backing map. This leads to exceptions and misbehavior as seen in #2928.This change does two things:
tiles()andentities()instead, this should also bring performance benefitsgetTiles()mutable again. This does not work as easy forgetEntities(), so I just hope no one outside of FAWE uses this method while relying on mutability.I also noticed that entity NBT stripping was broken, as we lowercase all keys to strip, but the code called toUpperCase when looking up if the key should be removed.
The
stripEntityNBTandstripBlockNBTmethods do not care about that at all, so I assume they won't work currently?