chore: add and use method for entity removal

Author: PierreSchwang

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java

@@ -167,6 +167,14 @@ public List<com.sk89q.worldedit.entity.Entity> getEntities() {
         return list;
     }
 
+    @Override
+    public int removeEntities(final Region region) {
+        List<com.sk89q.worldedit.entity.Entity> entities = getEntities(region);
+        return TaskManager.taskManager().sync(() -> entities.stream()
+                .mapToInt(entity -> entity.remove() ? 1 : 0).sum()
+        );
+    }
+
     //FAWE: createEntity was moved to IChunkExtent to prevent issues with Async Entity Add.
 
     /**

worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java

@@ -36,7 +36,6 @@
 import com.fastasyncworldedit.core.util.ImgurUtility;
 import com.fastasyncworldedit.core.util.MainUtil;
 import com.fastasyncworldedit.core.util.MaskTraverser;
-import com.fastasyncworldedit.core.util.TaskManager;
 import com.fastasyncworldedit.core.util.task.RunnableVal;
 import com.google.common.collect.Lists;
 import com.sk89q.worldedit.EditSession;
@@ -51,7 +50,6 @@
 import com.sk89q.worldedit.command.util.annotation.Confirm;
 import com.sk89q.worldedit.command.util.annotation.Preload;
 import com.sk89q.worldedit.command.util.annotation.SynchronousSettingExpected;
-import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
@@ -99,7 +97,6 @@
 import java.net.URI;
 import java.net.URL;
 import java.nio.file.Files;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -481,14 +478,7 @@ public void place(
                     .apply(region.getMaximumPoint().subtract(region.getMinimumPoint()).toVector3())
                     .toBlockPoint());
             if (removeEntities) {
-                // Collect entities on the current (command) thread, in case it benefits from asynchronous retrieval (unlikely)
-                final Collection<? extends Entity> entities = editSession.getEntities(new CuboidRegion(realTo, max));
-                // BukkitEntity#remove is synchronized, but it makes more sense to synchronize here beforehand in case many
-                // entities are affected. BukkitEntity will not synchronize if it's already called on the main thread.
-                TaskManager.taskManager().sync(() -> {
-                    entities.forEach(Entity::remove);
-                    return true;
-                });
+                editSession.removeEntities(new CuboidRegion(realTo, max));
             }
             if (selectPasted || onlySelect) {
                 RegionSelector selector = new CuboidRegionSelector(world, realTo, max);
@@ -578,9 +568,9 @@ public void paste(
             Vector3 realTo = to.toVector3().add(transform.apply(clipboardOffset.toVector3()));
             Vector3 max = realTo.add(transform.apply(region.getMaximumPoint().subtract(region.getMinimumPoint()).toVector3()));
 
-            // FAWE start - entity remova;l
+            // FAWE start - entity removal
             if (removeEntities) {
-                editSession.getEntities(new CuboidRegion(realTo.toBlockPoint(), max.toBlockPoint())).forEach(Entity::remove);
+                editSession.removeEntities(new CuboidRegion(realTo.toBlockPoint(), max.toBlockPoint()));
             }
             if (selectPasted || onlySelect) {
                 //FAWE end

worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java

@@ -176,6 +176,18 @@ default Entity createEntity(Location location, BaseEntity entity, UUID uuid) {
     default void removeEntity(int x, int y, int z, UUID uuid) {
     }
 
+    /**
+     * Removes all entities in the given region.
+     *
+     * @param region the region
+     * @return the number of entities removed
+     */
+    default int removeEntities(Region region) {
+        return this.getEntities(region).stream()
+                .mapToInt(entity -> entity.remove() ? 1 : 0)
+                .sum();
+    }
+
     /*
     Queue based methods
     TODO NOT IMPLEMENTED: