-
-
Notifications
You must be signed in to change notification settings - Fork 374
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
Allow multiple potential return types & defer expression type checking. #6624
Merged
Conversation
This file contains 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
Moderocky
requested review from
sovdeeth,
APickledWalrus and
UnderscoreTud
and removed request for
sovdeeth,
APickledWalrus and
UnderscoreTud
April 29, 2024 12:34
Moderocky
added
the
bug
An issue that needs to be fixed. Alternatively, a PR fixing an issue.
label
Apr 29, 2024
sovdeeth
approved these changes
Apr 29, 2024
UnderscoreTud
requested changes
Apr 29, 2024
src/main/java/ch/njol/skript/expressions/arithmetic/ExprArithmetic.java
Outdated
Show resolved
Hide resolved
AyhamAl-Ali
approved these changes
Apr 29, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✅ Day 18 of Kenzie hugely improving Skript.
src/test/skript/tests/regressions/6623-wrong parsing order for math.sk
Outdated
Show resolved
Hide resolved
AyhamAl-Ali
reviewed
Apr 29, 2024
src/test/skript/tests/regressions/6623-wrong parsing order for math.sk
Outdated
Show resolved
Hide resolved
AyhamAl-Ali
reviewed
Apr 29, 2024
src/test/skript/tests/regressions/6623-wrong parsing order for math.sk
Outdated
Show resolved
Hide resolved
UnderscoreTud
approved these changes
May 8, 2024
src/main/java/ch/njol/skript/expressions/arithmetic/ExprArithmetic.java
Outdated
Show resolved
Hide resolved
src/main/java/ch/njol/skript/expressions/arithmetic/ExprArithmetic.java
Outdated
Show resolved
Hide resolved
APickledWalrus
requested changes
May 8, 2024
src/main/java/ch/njol/skript/lang/util/ConvertedExpression.java
Outdated
Show resolved
Hide resolved
APickledWalrus
approved these changes
May 16, 2024
sovdeeth
added
patch-ready
A PR/issue that has been approved and is ready to be merged/closed for the next patch version.
2.8
Targeting a 2.8.X version release
and removed
2.9
Targeting a 2.9.X version release
labels
May 29, 2024
… math.sk Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com>
… math.sk Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>
Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com>
Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>
Also enables the usage of multiple converters to further avoid conversion loss
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
2.8
Targeting a 2.8.X version release
bug
An issue that needs to be fixed. Alternatively, a PR fixing an issue.
patch-ready
A PR/issue that has been approved and is ready to be merged/closed for the next patch version.
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.
Description
Fixes weird parse error from converted object return types.
send health of {z} / max health of {z}
was originally interpreted assend health of ({z} / max health of {z})
since the arithmetic has an Object return type, which is vacuously convertible to LivingEntity.This change does several things:
getReturnType()
)This now means that: 1. fewer things are converted (when they don't need to be) 2. things are less likely to attempt a conversion when it's inconceivable for it to be correct.
Note: there should be no breaking changes for any existing syntax.
Target Minecraft Versions: any
Requirements: none
Related Issues: fixes #6623