mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2024-12-09 04:30:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add makeShape Expression overload for consistency.

Browse Source
This commit is contained in:
wizjany 2020-04-16 09:44:06 -04:00
parent cd9a45bd6b
commit fa0618d9e3
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -2070,10 +2070,23 @@ public int makeShape(final Region region, final Vector3 zero, final Vector3 unit
* @throws MaxChangedBlocksException
*/
public int makeShape(final Region region, final Vector3 zero, final Vector3 unit,
final Pattern pattern, final String expressionString, final boolean hollow, final int timeout)
final Pattern pattern, final String expressionString, final boolean hollow, final int timeout)
throws ExpressionException, MaxChangedBlocksException {
final Expression expression = Expression.compile(expressionString, "x", "y", "z", "type", "data");
expression.optimize();
return makeShape(region, zero, unit, pattern, expression, hollow, timeout);
}
public int makeShape(final Region region, final Vector3 zero, final Vector3 unit,
final Pattern pattern, final Expression expression, final boolean hollow, final int timeout)
throws ExpressionException, MaxChangedBlocksException {
expression.getSlots().getVariable("x")
.orElseThrow(IllegalStateException::new);
expression.getSlots().getVariable("y")
.orElseThrow(IllegalStateException::new);
expression.getSlots().getVariable("z")
.orElseThrow(IllegalStateException::new);
final Variable typeVariable = expression.getSlots().getVariable("type")
.orElseThrow(IllegalStateException::new);