From 2517aca66fb91cd4127c60ca92ab4537924f3397 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Sun, 28 Jun 2020 17:31:13 -0400
Subject: [PATCH] Removed some unnecessary code.
---
.../main/java/com/boydti/fawe/FaweAPI.java | 26 -------------------
.../com/boydti/fawe/object/HistoryExtent.java | 2 +-
.../object/changeset/AbstractChangeSet.java | 1 +
.../fawe/object/regions/FuzzyRegion.java | 13 +++-------
4 files changed, 5 insertions(+), 37 deletions(-)
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java b/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java
index f725f7e39..66c0f0978 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java
@@ -78,32 +78,6 @@ public class FaweAPI {
return TaskManager.IMP;
}
-// /**
-// * Add a custom mask for use in e.g {@literal //mask #id:}
-// *
-// * @param methods The class with a bunch of mask methods
-// * @return true if the mask was registered
-// * @see com.sk89q.worldedit.command.MaskCommands
-// */
-// public static boolean registerMasks(Object methods) {
-// DefaultMaskParser parser = getParser(DefaultMaskParser.class);
-// if (parser != null) parser.register(methods);
-// return parser != null;
-// }
-//
-// /**
-// * Add a custom material for use in e.g {@literal //material #id:}
-// *
-// * @param methods The class with a bunch of pattern methods
-// * @return true if the mask was registered
-// * @see com.sk89q.worldedit.command.PatternCommands
-// */
-// public static boolean registerPatterns(Object methods) {
-// DefaultPatternParser parser = getParser(DefaultPatternParser.class);
-// if (parser != null) parser.register(methods);
-// return parser != null;
-// }
-//
// /**
// * Add a custom transform for use in
// *
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/HistoryExtent.java b/worldedit-core/src/main/java/com/boydti/fawe/object/HistoryExtent.java
index e6ae99514..4ae2da1aa 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/HistoryExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/HistoryExtent.java
@@ -30,7 +30,7 @@ public class HistoryExtent extends AbstractDelegateExtent {
/**
* Create a new instance.
*
- * @param extent the extent
+ * @param extent the extent
* @param changeSet the change set
*/
public HistoryExtent(Extent extent, AbstractChangeSet changeSet) {
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/AbstractChangeSet.java b/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/AbstractChangeSet.java
index 4fa22d579..ad5f0ca79 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/AbstractChangeSet.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/AbstractChangeSet.java
@@ -46,6 +46,7 @@ public abstract class AbstractChangeSet implements ChangeSet, IBatchProcessor {
private final World world;
protected AtomicInteger waitingCombined = new AtomicInteger(0);
protected AtomicInteger waitingAsync = new AtomicInteger(0);
+
protected boolean closed;
public AbstractChangeSet(World world) {
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/regions/FuzzyRegion.java b/worldedit-core/src/main/java/com/boydti/fawe/object/regions/FuzzyRegion.java
index d710bd92b..ff1ad748a 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/regions/FuzzyRegion.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/regions/FuzzyRegion.java
@@ -2,11 +2,7 @@ package com.boydti.fawe.object.regions;
import com.boydti.fawe.object.collection.BlockVectorSet;
import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.function.RegionFunction;
-import com.sk89q.worldedit.function.mask.AbstractExtentMask;
-import com.sk89q.worldedit.function.mask.DelegateExtentMask;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.operation.Operations;
import com.sk89q.worldedit.function.visitor.RecursiveVisitor;
@@ -45,12 +41,9 @@ public class FuzzyRegion extends AbstractRegion {
}
public void select(int x, int y, int z) {
- RecursiveVisitor search = new RecursiveVisitor(mask.withExtent(extent), new RegionFunction() {
- @Override
- public boolean apply(BlockVector3 p) throws WorldEditException {
- setMinMax(p.getBlockX(), p.getBlockY(), p.getBlockZ());
- return true;
- }
+ RecursiveVisitor search = new RecursiveVisitor(mask.withExtent(extent), p -> {
+ setMinMax(p.getBlockX(), p.getBlockY(), p.getBlockZ());
+ return true;
}, 256);
search.setVisited(set);
search.visit(BlockVector3.at(x, y, z));