Skip to content

allow location to be parsed from an exact string #8773

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

Open
MrScopes wants to merge 6 commits into
base: dev/feature
Choose a base branch
from
+63 −3
Open

allow location to be parsed from an exact string #8773

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3b2ec8a
allow location to be parsed from an exact string
MrScopes Jul 13, 2026
a2f5b51
Restore gradlew.bat
MrScopes Jul 13, 2026
135660b
allow world to be null. don't allow location to be parsed in commands
MrScopes Jul 13, 2026
99a29e3
separators and string splitting over regex
MrScopes Jul 15, 2026
a91c2ba
clean unused imports
MrScopes Jul 15, 2026
11ff751
restore gradle
MrScopes Jul 26, 2026
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
44 changes: 43 additions & 1 deletion src/main/java/org/skriptlang/skript/bukkit/types/LocationClassInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
import org.skriptlang.skript.lang.properties.handlers.WXYZHandler;
import org.skriptlang.skript.lang.properties.handlers.base.PropertyHandler;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

import java.io.StreamCorruptedException;

@ApiStatus.Internal
Expand Down Expand Up @@ -147,10 +150,49 @@ public boolean requiresSourceExprChange() {
}

private static class LocationParser extends Parser<Location> {
private static final String NUMBER = "[-+]?\\d+(?:\\.\\d+)?";

@bluelhf bluelhf Jul 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Don't use a regex matcher, split based on keywords and use the same parsers that are used for toString in the first place.

@MrScopes MrScopes Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Don't use a regex matcher, split based on keywords and use the same parsers that are used for toString in the first place.

which approach would you recommend?

substring at each
x:
y:
z:
...
manually handle world as a part of pitch

or, do the same thing but split at commas?
the issue is there's still some requirement to run different code to get the world since the format is
x: 0, y: 0, z: 0, yaw: 0, pitch: 0 in world 'world'
since in world is basically apart of pitch if I split at by commas
this is why I thought using regex instead was a no brainer

@bluelhf bluelhf Jul 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Split at x: , , y: , , z: , , yaw: , , pitch: and in ' (the exact strings from toString); if the last of which is missing, then the world was null. Not using regex helps avoid bugs here, for example your current NUMBER regex is incorrect because it does not match NaN or Infinity (which are valid outputs from toString!)

@MrScopes MrScopes Jul 15, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Pushed my most recent changes. is this what you meant?


private static final Pattern LOCATION_PATTERN = Pattern.compile(
"^x:\\s*(" + NUMBER + ")" +
",\\s*y:\\s*(" + NUMBER + ")" +
",\\s*z:\\s*(" + NUMBER + ")" +
",\\s*yaw:\\s*(" + NUMBER + ")" +
",\\s*pitch:\\s*(" + NUMBER + ")" +
"(?:\\s+in\\s+'([^']+)')?$"
);

//<editor-fold desc="location parser" defaultstate="collapsed">
@Override
public boolean canParse(ParseContext context) {
return false;
return true;
Comment thread
MrScopes marked this conversation as resolved.
Outdated
}

@Override
public @Nullable Location parse(String input, ParseContext context) {
Matcher matcher = LOCATION_PATTERN.matcher(input.trim());
if (!matcher.matches())
return null;

try {
double x = Double.parseDouble(matcher.group(1));
double y = Double.parseDouble(matcher.group(2));
double z = Double.parseDouble(matcher.group(3));
float yaw = Float.parseFloat(matcher.group(4));
float pitch = Float.parseFloat(matcher.group(5));

String worldName = matcher.group(6);
World world = null;

if (worldName != null) {
world = Bukkit.getWorld(worldName);
if (world == null)
return null;
Comment thread
MrScopes marked this conversation as resolved.
Outdated
}

return new Location(world, x, y, z, yaw, pitch);
} catch (NumberFormatException exception) {
return null;
Comment thread
MrScopes marked this conversation as resolved.
}
}

@Override
Expand Down
Loading