Skip to content

Fix nullable direction combine #8121

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

Merged
merged 3 commits into from
Aug 29, 2025
Merged

Fix nullable direction combine #8121

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5b9ea2
Allow Direction.combine to be nullable
TheLimeGlass Aug 10, 2025
ce1f5be
requested changes
TheLimeGlass Aug 11, 2025
4939577
Merge branch 'dev/patch' into fix/direction-combine-null
sovdeeth Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/main/java/ch/njol/skript/util/Direction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,18 @@ public static Direction deserialize(final String s) {
}
}
}

public static Expression<Location> combine(final Expression<? extends Direction> dirs, final Expression<? extends Location> locs) {

/*
* Combines direction and location expressions.
* Useful for syntaxes to allow Skripters to have more control over their locations.
* @param dirs The direction expressions to combine.
* @param locs The location expressions to combine.
* @return A combined expression or null if any of the inputs are null.
*/
public static @Nullable Expression<Location> combine(@Nullable Expression<? extends Direction> dirs, @Nullable Expression<? extends Location> locs) {
if (dirs == null || locs == null)
return null;

return new SimpleExpression<Location>() {
@SuppressWarnings("null")
@Override
Expand Down