Upstream Merge

This commit is contained in:
MattBDev
2020-01-10 22:32:12 -05:00
parent b2be1ea9fb
commit 0d2fff2cd2
81 changed files with 2528 additions and 23695 deletions

View File

@ -61,8 +61,8 @@ public class ExpressionMaskParser extends InputParser<Mask> {
exp.setEnvironment(env);
if (context.getActor() != null) {
SessionOwner owner = context.getActor();
Integer timeout = WorldEdit.getInstance().getSessionManager().get(owner).getTimeout();
return new ExpressionMask(exp, timeout::intValue);
IntSupplier timeout = () -> WorldEdit.getInstance().getSessionManager().get(owner).getTimeout();
return new ExpressionMask(exp, timeout);
}
return new ExpressionMask(exp);
} catch (ExpressionException e) {

View File

@ -32,8 +32,6 @@ import com.sk89q.worldedit.math.BlockVector3;
import java.util.stream.Stream;
import java.util.stream.Stream;
public class OffsetMaskParser extends InputParser<Mask> {
public OffsetMaskParser(WorldEdit worldEdit) {