diff --git a/docs/scarpet/Full.md b/docs/scarpet/Full.md index fb0c40b7..1d0473a7 100644 --- a/docs/scarpet/Full.md +++ b/docs/scarpet/Full.md @@ -1109,7 +1109,7 @@ for(range(1000000,1100000),check_prime(_)) => 7216 From which we can learn that there is 7216 primes between 1M and 1.1M -### `while(cond, limit)` +### `while(cond, limit,expr)` Evaluates expression `expr` repeatedly until condition `cond` becomes false, but not more than `limit` times. Returns the result of the last `expr` evaluation, or `null` if nothing was successful. Both `expr` and `cond` will diff --git a/docs/scarpet/api/Entities.md b/docs/scarpet/api/Entities.md index 3bf577ce..18157bb9 100644 --- a/docs/scarpet/api/Entities.md +++ b/docs/scarpet/api/Entities.md @@ -155,12 +155,12 @@ query(e,'custom_name') => null query(e,'type') => villager -## `query(e, 'command_name')` +### `query(e, 'command_name')` Returns a valid string to be used in commands to address an entity. Its UUID for all entities except player, where its their name. -## `query(e, 'persistence')` +### `query(e, 'persistence')` Returns if a mob has a persistence tag or not. Returns `null` for non-mob entities. diff --git a/docs/scarpet/language/LoopsAndHigherOrderFunctions.md b/docs/scarpet/language/LoopsAndHigherOrderFunctions.md index 82fdacd3..fa3ab931 100644 --- a/docs/scarpet/language/LoopsAndHigherOrderFunctions.md +++ b/docs/scarpet/language/LoopsAndHigherOrderFunctions.md @@ -49,7 +49,7 @@ for(range(1000000,1100000),check_prime(_)) => 7216 From which we can learn that there is 7216 primes between 1M and 1.1M -### `while(cond, limit)` +### `while(cond, limit, expr)` Evaluates expression `expr` repeatedly until condition `cond` becomes false, but not more than `limit` times. Returns the result of the last `expr` evaluation, or `null` if nothing was successful. Both `expr` and `cond` will @@ -145,4 +145,4 @@ it will be used from now on as a new value for the accumulator.
 reduce([1,2,3,4],_a+_,0)  => 10
 reduce([1,2,3,4],_a*_,1)  => 24
-
\ No newline at end of file + diff --git a/src/main/java/carpet/settings/ParsedRule.java b/src/main/java/carpet/settings/ParsedRule.java index f25b0a38..54d352b7 100644 --- a/src/main/java/carpet/settings/ParsedRule.java +++ b/src/main/java/carpet/settings/ParsedRule.java @@ -61,9 +61,12 @@ public final class ParsedRule implements Comparable { { this.options = ImmutableList.copyOf(rule.options()); } - else if (this.type == boolean.class || (this.type == String.class && categories.contains(RuleCategory.COMMAND))) + else if (this.type == boolean.class){ + this.options = ImmutableList.of("true","false"); + } + else if(this.type == String.class && categories.contains(RuleCategory.COMMAND)) { - this.options = ImmutableList.of("true", "false"); + this.options = ImmutableList.of("true", "false", "ops"); } else if (this.type.isEnum()) {