Merge branch 'master' into 1.16
# Conflicts: # src/main/java/carpet/script/CarpetExpression.java
This commit is contained in:
commit
208c066da1
1 file changed
+1
-1
@@ -511,7 +511,7 @@ public class CarpetExpression
|
||||
return LazyValue.NULL;
|
||||
}
|
||||
|
||||
Value ret = ListValue.wrap(store.getInCircle(condition, pos, (int)radius, status).map( p ->
|
||||
Value ret = ListValue.wrap(store.getInCircle(condition, pos, (int)radius, status).sorted(Comparator.comparingDouble(p -> p.getPos().getSquaredDistance(pos))).map(p ->
|
||||
ListValue.of(
|
||||
new StringValue(p.getType().toString()),
|
||||
new NumericValue(p.getType().getTicketCount() - ((PointOfInterest_scarpetMixin)p).getFreeTickets()),
|
||||
|
||||
Reference in new issue
Block a user