Merge branch 'master' into 1.17
# Conflicts: # src/main/java/carpet/script/api/Auxiliary.java # src/main/java/carpet/script/utils/ShapeDispatcher.java # src/main/java/carpet/script/value/EntityValue.java # src/main/java/carpet/script/value/ListValue.java
This commit is contained in:
commit
c720c2c935
18 files changed
+83
-110
No files matched your search
@@ -102,7 +102,7 @@ public class ValueConversions
|
||||
{
|
||||
return ListValue.of(
|
||||
StringValue.of(criteria.getName()),
|
||||
new NumericValue(criteria.isReadOnly())
|
||||
BooleanValue.of(criteria.isReadOnly())
|
||||
);
|
||||
}
|
||||
|
||||
@@ -209,7 +209,7 @@ public class ValueConversions
|
||||
new BlockValue(null, world, node.getBlockPos()),
|
||||
new StringValue(node.type.name().toLowerCase(Locale.ROOT)),
|
||||
new NumericValue(node.penalty),
|
||||
new NumericValue(node.visited)
|
||||
BooleanValue.of(node.visited)
|
||||
));
|
||||
}
|
||||
return ListValue.wrap(nodes);
|
||||
@@ -243,7 +243,7 @@ public class ValueConversions
|
||||
}
|
||||
if (v instanceof Boolean)
|
||||
{
|
||||
return new NumericValue((Boolean) v);
|
||||
return BooleanValue.of((Boolean) v);
|
||||
}
|
||||
if (v instanceof UUID)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user