Adventure 5.1.1 (Upstream Rebase)#883
Merged
Merged
Conversation
R00tB33rMan
changed the title
R00tB33rMan
changed the title
R00tB33rMan
changed the title
R00tB33rMan
approved these changes
May 17, 2026
R00tB33rMan
left a comment
R00tB33rMan
left a comment
Member
There was a problem hiding this comment.
The initial upstream PR's concern revolved around an ABI breakage; that is no longer an issue. Velocity doesn't appear to require any other change(s) to make this compatible; thus, we'll go ahead and merge this early.
R00tB33rMan
changed the title
R00tB33rMan
added a commit
that referenced
this pull request
May 27, 2026
It appears some plugins tie to this. This will be reapplied or modified at a future date, when upstream themselves merge 5.1.1 (or newer) support.
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
2 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.
Cherry-picked commits from #878.
This is an early merge of PaperMC#1774.