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 AIOOB with ExprVectorXYZ when used with non-vectors #6387

Merged
merged 2 commits into from
Feb 4, 2024
Merged

Fix AIOOB with ExprVectorXYZ when used with non-vectors #6387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a32434b
fix aioob error and add regression test
sovdeeth Feb 2, 2024
03d4a33
Merge branch 'dev/patch' into fix/component-of-block-exception
sovdeeth Feb 4, 2024
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
5 changes: 4 additions & 1 deletion src/main/java/ch/njol/skript/expressions/ExprVectorXYZ.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
public class ExprVectorXYZ extends SimplePropertyExpression<Vector, Number> {

static {
register(ExprVectorXYZ.class, Number.class, "[vector] (0¦x|1¦y|2¦z) [component[s]]", "vectors");
// TODO: Combine with ExprCoordinates for 2.9
register(ExprVectorXYZ.class, Number.class, "[vector] (0:x|1:y|2:z) [component[s]]", "vectors");
}

private final static Character[] axes = new Character[] {'x', 'y', 'z'};
Expand Down Expand Up @@ -84,6 +85,8 @@ public Class<?>[] acceptChange(ChangeMode mode) {
public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
assert delta != null;
Vector[] vectors = getExpr().getArray(event);
if (vectors.length == 0)
return;
double deltaValue = ((Number) delta[0]).doubleValue();
switch (mode) {
case REMOVE:
Expand Down
3 changes: 3 additions & 0 deletions src/test/skript/tests/regressions/6385-x component of block.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
test "x component of block":
set {_a} to block at location(0, 0, 0)
add 1 to x of {_a} # should not throw exception
Loading