Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-06 20:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove FawePlayer and API modifications

Browse Source
This commit is contained in:
MattBDev
2019-09-13 23:05:16 -04:00
parent c65e06cb1b
commit 14ed3f1d9c
105 changed files with 1614 additions and 2407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask.java
View File

@ -21,7 +21,6 @@ package com.sk89q.worldedit.function.mask;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.internal.expression.Expression;
import com.sk89q.worldedit.internal.expression.ExpressionException;
import com.sk89q.worldedit.internal.expression.runtime.EvaluationException;
@ -40,7 +39,7 @@ import java.util.function.IntSupplier;
public class ExpressionMask extends AbstractMask {
private final Expression expression;
private final int timeout;
private final IntSupplier timeout;
/**
* Create a new instance.
@ -58,10 +57,10 @@ public class ExpressionMask extends AbstractMask {
* @param expression the expression
*/
public ExpressionMask(Expression expression) {
this(expression, WorldEdit.getInstance().getConfiguration().calculationTimeout);
this(expression, null);
}
public ExpressionMask(Expression expression, int timeout) {
public ExpressionMask(Expression expression, @Nullable IntSupplier timeout) {
checkNotNull(expression);
this.expression = expression;
this.timeout = timeout;
@ -73,7 +72,12 @@ public class ExpressionMask extends AbstractMask {
if (expression.getEnvironment() instanceof WorldEditExpressionEnvironment) {
((WorldEditExpressionEnvironment) expression.getEnvironment()).setCurrentBlock(vector.toVector3());
}
return expression.evaluateTimeout(timeout, vector.getX(), vector.getY(), vector.getZ()) > 0;
if (timeout == null) {
return expression.evaluate(vector.getX(), vector.getY(), vector.getZ()) > 0;
} else {
return expression.evaluate(new double[]{vector.getX(), vector.getY(), vector.getZ()},
timeout.getAsInt()) > 0;
}
} catch (EvaluationException e) {
return false;
}

16
worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExpressionMask2D.java
View File

@ -21,19 +21,17 @@ package com.sk89q.worldedit.function.mask;
import static com.google.common.base.Preconditions.checkNotNull;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.internal.expression.Expression;
import com.sk89q.worldedit.internal.expression.ExpressionException;
import com.sk89q.worldedit.internal.expression.runtime.EvaluationException;
import com.sk89q.worldedit.math.BlockVector2;
import javax.annotation.Nullable;
import java.util.function.IntSupplier;
import javax.annotation.Nullable;
public class ExpressionMask2D extends AbstractMask2D {
private final Expression expression;
private final int timeout;
private final IntSupplier timeout;
/**
* Create a new instance.
@ -51,10 +49,10 @@ public class ExpressionMask2D extends AbstractMask2D {
* @param expression the expression
*/
public ExpressionMask2D(Expression expression) {
this(expression, WorldEdit.getInstance().getConfiguration().calculationTimeout);
this(expression, null);
}
public ExpressionMask2D(Expression expression, int timeout) {
public ExpressionMask2D(Expression expression, @Nullable IntSupplier timeout) {
checkNotNull(expression);
this.expression = expression;
this.timeout = timeout;
@ -63,7 +61,11 @@ public class ExpressionMask2D extends AbstractMask2D {
@Override
public boolean test(BlockVector2 vector) {
try {
return expression.evaluateTimeout(timeout, vector.getX(), 0, vector.getZ()) > 0;
if (timeout != null) {
return expression.evaluate(vector.getX(), 0, vector.getZ()) > 0;
} else {
return expression.evaluate(new double[]{vector.getX(), 0, vector.getZ()}, timeout.getAsInt()) > 0;
}
} catch (EvaluationException e) {
return false;
}