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

Add condition type to fix parsing order #5809

Merged
merged 11 commits into from
Aug 19, 2024
Merged

Conversation

TheLimeGlass
Copy link
Collaborator

@TheLimeGlass TheLimeGlass commented Jul 10, 2023

Description

Add condition type to fix parsing order. This is exactly the same as ExpressionType, shouldn't be a huge impact at all.


Target Minecraft Versions: any
Requirements: none
Related Issues: #5536, #5804

this probably fixes other issues too.

@TheLimeGlass TheLimeGlass added bug An issue that needs to be fixed. Alternatively, a PR fixing an issue. enhancement Feature request, an issue about something that could be improved, or a PR improving something. labels Jul 10, 2023
@TheLimeGlass TheLimeGlass marked this pull request as draft July 10, 2023 02:49
@TheLimeGlass TheLimeGlass marked this pull request as ready for review July 10, 2023 02:49
Copy link
Member

@Moderocky Moderocky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, I'd like to make sure this isn't going to (somehow) break a bunch of scripts by changing the parsing orders.

@TheLimeGlass
Copy link
Collaborator Author

TheLimeGlass commented Jul 10, 2023

Looks good, I'd like to make sure this isn't going to (somehow) break a bunch of scripts by changing the parsing orders.

2.8 betas will find out, I didn't find any from the tests, but it gets the proper conditions to work, so that's a plus.

@TheLimeGlass TheLimeGlass marked this pull request as draft July 11, 2023 16:59
@TheLimeGlass TheLimeGlass changed the base branch from master to dev/feature October 28, 2023 09:52
@TheLimeGlass TheLimeGlass marked this pull request as ready for review February 22, 2024 19:01
Copy link
Member

@Moderocky Moderocky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflicts need fixing.

Copy link
Member

@APickledWalrus APickledWalrus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implementation is fine. The idea of condition priorities exists in #6246 which may end up getting merged for 2.10 (meaning this PR may only need to set priorities for something like CondCompare)

src/test/skript/tests/regressions/5804-is-burning.sk Outdated Show resolved Hide resolved
@TheLimeGlass
Copy link
Collaborator Author

When I created this pull request, I wanna add that this fix actually turned out surprisingly well, it fixed so many issues, and it's very simple in the fact that it's just modifying the list order like Expressions with ExpressionType.

@Moderocky Moderocky added the feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. label Aug 19, 2024
@APickledWalrus
Copy link
Member

Oh yeah I think the idea is good. I'm fine with merging this.

@Moderocky Moderocky merged commit a4c107b into dev/feature Aug 19, 2024
4 checks passed
@Moderocky Moderocky deleted the feature/condition-types branch August 19, 2024 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug An issue that needs to be fixed. Alternatively, a PR fixing an issue. enhancement Feature request, an issue about something that could be improved, or a PR improving something. feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants