Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes issues in the suppress dismount cancellation patch #10735

Merged

Conversation

Machine-Maker
Copy link
Member

The suppressCancellation functionality here isn't used almost anywhere, especially in teleportation despite the patch title. However it will be once the re-work of internal teleportation logic is done. This fixes an issue in that patch where the original OBFHELPER name selected for the overloads turned out to conflict with a mojang named method so the overrides where almost linked together in such a way to cause a StackOverflow. I don't think there was a possibility of one, but this removes all chance.

@Machine-Maker Machine-Maker requested a review from a team as a code owner May 16, 2024 19:23
@Machine-Maker Machine-Maker force-pushed the fix/dismount-suppress-cancels branch from d46d99b to b5f4eee Compare May 16, 2024 19:36
@Machine-Maker Machine-Maker force-pushed the fix/dismount-suppress-cancels branch from b5f4eee to 7dccb31 Compare May 17, 2024 21:33
@Machine-Maker Machine-Maker merged commit 5a9afbe into PaperMC:master May 17, 2024
3 checks passed
@Machine-Maker Machine-Maker deleted the fix/dismount-suppress-cancels branch May 17, 2024 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

3 participants