Skip to content

Commit 7e11828

Browse files
committed
requested changes
1 parent 7833cc5 commit 7e11828

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/main/java/ch/njol/skript/conditions/CondIsDivisibleBy.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,10 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
4545
@Override
4646
public boolean check(Event event) {
4747
Number divisorNumber = divisor.getSingle(event);
48-
return dividend.check(event, new Checker<Number>() {
49-
@Override
50-
public boolean check(Number dividendNumber) {
51-
double dividend = dividendNumber.doubleValue();
52-
double divisor = divisorNumber.doubleValue();
53-
return dividend % divisor == 0;
54-
}
55-
}, isNegated());
48+
if (divisorNumber == null)
49+
return isNegated();
50+
double divisor = divisorNumber.doubleValue();
51+
return dividend.check(event, dividendNumber -> (dividendNumber.doubleValue() % divisor == 0), isNegated());
5652
}
5753

5854
@Override

src/test/skript/tests/syntaxes/conditions/CondIsDivisibleBy.sk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ test "is divisible":
44
assert 5 isn't evenly divisible by 0 with "nothing can be divided by 0!"
55
assert 1964903306 is evenly divisible by 982451653 with "1964903306 is divisible by 982451653!"
66
assert {_none} is evenly divisible by 10 to fail with "you cannot divide by <none>!"
7-
assert 5, 10, 15 can be evenly divided by 5 with "5, 10, and 15 can be evenly divided by 5!"
8-
assert 3, 5, 7 cannot be evenly divided by 2 with "3, 5, and 7 cannot be evenly divided by 2!"
7+
assert 5, 10, and 15 can be evenly divided by 5 with "5, 10, and 15 can be evenly divided by 5!"
8+
assert 3, 5, and 7 cannot be evenly divided by 2 with "3, 5, and 7 cannot be evenly divided by 2!"
9+
assert 5 or 10 or 15 can be evenly divided by 5 with "5 or 10 or 15 can be evenly divided by 5!"
10+
assert 3 or 5 or 7 cannot be evenly divided by 2 with "3 or 5 or 7 cannot be evenly divided by 2!"

0 commit comments

Comments
 (0)