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.

Sign up for GitHub

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

Jump to bottom

Fix the legendary compare issue with two same literals #5503

Merged
merged 34 commits into from
Jun 2, 2023
Merged

Fix the legendary compare issue with two same literals #5503

merged 34 commits into from
Jun 2, 2023

Conversation

TheLimeGlass
Copy link
Collaborator

@TheLimeGlass TheLimeGlass commented Mar 10, 2023 •
edited
Loading

Description

Fixes the legendary compare issue with two same literals. Example: Skript would set fire as visual effect, and then if you went to compare it against a block it would error. Skript should be assuming fire is an itemtype and compare against it. More details at #5497

I also added file context to the EffAssert because I had many tests fail during testing and needed to know which files they belong to.

I also added event-block and event-location to the test event so that it can match the JUnit values.

Target Minecraft Versions: any
Requirements: none
Related Issues: #2711, #4773, #5497, #5557 and #5675 there are probably more I couldn't find.

duplicates: #4769, #4774, #4779, #4809

@TheLimeGlass TheLimeGlass added the bug An issue that needs to be fixed. Alternatively, a PR fixing an issue. label Mar 10, 2023
@TheLimeGlass TheLimeGlass mentioned this pull request Mar 10, 2023
Closed
@TheLimeGlass TheLimeGlass mentioned this pull request Mar 10, 2023
Closed
@TheLimeGlass TheLimeGlass mentioned this pull request Mar 19, 2023
Open
1 task
@TheLimeGlass TheLimeGlass mentioned this pull request Mar 31, 2023
Closed
1 task
@TheLimeGlass TheLimeGlass added the priority: medium Issues that are detrimental to user experience (prohibitive bugs or lack of useful implementation). label Mar 31, 2023
Moderocky
Moderocky reviewed Apr 8, 2023
View reviewed changes
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 nice, are you sure it won't break anything else?

@TheLimeGlass
Copy link
Collaborator Author

Looks nice, are you sure it won't break anything else?

Yes

@TheLimeGlass TheLimeGlass added the 2.7 Targeting a 2.7.X version release label Apr 14, 2023
Moderocky
Moderocky approved these changes Apr 14, 2023
View reviewed changes
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.

I can't see any problems with this.

UnderscoreTud
UnderscoreTud reviewed Apr 21, 2023
View reviewed changes
Copy link
Member

@UnderscoreTud UnderscoreTud left a comment

Choose a reason for hiding this comment

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

I'd revert the other stuff as it's not in the scope of this pr or related to it in anyway

src/main/java/ch/njol/skript/conditions/CondCompare.java Show resolved Hide resolved
@UnderscoreTud
Copy link
Member

Also, tests are failing

AyhamAl-Ali
AyhamAl-Ali requested changes Apr 23, 2023
View reviewed changes
Copy link
Member

@AyhamAl-Ali AyhamAl-Ali left a comment

Choose a reason for hiding this comment

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

Well done ⚡

Code wise looks good, I haven't made enough tests though so I prefer this gets more testing by the community.

src/main/java/ch/njol/skript/conditions/CondCompare.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/test/runner/TestTracker.java Outdated Show resolved Hide resolved
src/test/java/org/skriptlang/skript/test/tests/regression/HangingEntity_4871.java Outdated Show resolved Hide resolved
src/test/java/org/skriptlang/skript/test/tests/regression/HangingEntity_4871.java Outdated Show resolved Hide resolved
src/test/skript/tests/regressions/2711-item-compares.sk Outdated Show resolved Hide resolved
src/test/skript/tests/regressions/3303-item durability.sk Outdated Show resolved Hide resolved
src/test/skript/tests/regressions/4769-fire-visualeffect.sk Outdated Show resolved Hide resolved
src/test/skript/tests/syntaxes/expressions/ExprBlockData.sk Outdated Show resolved Hide resolved
@AyhamAl-Ali AyhamAl-Ali mentioned this pull request May 28, 2023
Closed
1 task
@TheLimeGlass TheLimeGlass mentioned this pull request May 30, 2023
Open
@TheLimeGlass TheLimeGlass mentioned this pull request May 30, 2023
Closed
APickledWalrus
APickledWalrus approved these changes May 30, 2023
View reviewed changes
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.

Looks good to me. Would be good to have for testing in beta3. Nice work :)

@TheLimeGlass TheLimeGlass removed the request for review from TPGamesNL May 30, 2023 21:47
AyhamAl-Ali
AyhamAl-Ali approved these changes May 31, 2023
View reviewed changes
Copy link
Member

@AyhamAl-Ali AyhamAl-Ali left a comment

Choose a reason for hiding this comment

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

Looking good ⚡

src/main/java/ch/njol/skript/test/runner/TestTracker.java Outdated Show resolved Hide resolved
@TheLimeGlass TheLimeGlass merged commit 407a680 into master Jun 2, 2023
@TheLimeGlass TheLimeGlass deleted the fix/convert-compare branch June 2, 2023 05:28
@TheLimeGlass TheLimeGlass mentioned this pull request Jun 10, 2023
Closed
1 task
@TheLimeGlass TheLimeGlass mentioned this pull request Aug 27, 2023
Merged
@sovdeeth sovdeeth mentioned this pull request Aug 27, 2023
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Moderocky Moderocky Moderocky approved these changes

@AyhamAl-Ali AyhamAl-Ali AyhamAl-Ali approved these changes

@APickledWalrus APickledWalrus APickledWalrus approved these changes

@UnderscoreTud UnderscoreTud UnderscoreTud approved these changes

Assignees
No one assigned
Labels
2.7 Targeting a 2.7.X version release bug An issue that needs to be fixed. Alternatively, a PR fixing an issue. priority: medium Issues that are detrimental to user experience (prohibitive bugs or lack of useful implementation).
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@TheLimeGlass @UnderscoreTud @Moderocky @AyhamAl-Ali @APickledWalrus