chore: upstream merges #3184
Merged
chore: upstream merges #3184
Conversation
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
….3.x Add ability to copy state string from info tool Co-authored-by: ssquadteam <sahib.2009.sa@gmail.com>
Remove a redundant passenger check, as entity.save() returns false in that case.
This also causes leash knots to not be copied. I don't think this is a problem because:
- They would not be saved to disk, it's misleading for users that they appear.
- Pasted leashed mobs still think they're leashed to the original position and get unleashed* - no change in behaviour.
\* Unless they're pasted close enough to the original position, in which case this has better behaviour because they create their own leash_knot entity.
Hacky workaround by overwriting the text3 StyleSerializer class with our own modified copy. Note that the hover events "show_entity" and "show_item" aren't supported as they no longer take a rendered component, but just the NBT structure. Behavior remains unchanged if 1.21.4- is detected. Fixes #2756.
NotMyFault
approved these changes
Apr 26, 2025
SirYwell
reviewed
Apr 27, 2025
dordsor21
force-pushed
the
chore/upstream-cherry-pick
branch
from
ea20641 to
54a7622
Compare
SirYwell
force-pushed
the
chore/upstream-cherry-pick
branch
from
88706bb to
dfe642b
Compare
SirYwell
approved these changes
May 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 #3179