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

Fixed incompatibility with BleachHack #4626

Merged
merged 1 commit into from
Jun 6, 2024

Conversation

tyrannus00
Copy link
Contributor

@tyrannus00 tyrannus00 commented Jun 5, 2024

Type of change

  • Bug fix
  • New feature

Description

Both Meteor and Bleach target the same method with a @Redirect mixin, which caused a crash. To fix that, I replaced the @Redirect in Meteor with a @WrapOperation, which is functionally the same, but doesn't crash when another mod injects in the same place.

How Has This Been Tested?

Tested it in singleplayer by testing the Jesus module in both Meteor and Bleach.

Checklist:

  • My code follows the style guidelines of this project.
  • I have added comments to my code in more complex areas.
  • I have tested the code in both development and production environments.

@MineGame159 MineGame159 merged commit 580ad3f into MeteorDevelopment:master Jun 6, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants