Optimized EditSession.countBlocks.

Also fixed the questionable semantics for that anonymous class' "contains" method.
EngineHub · Jun 23, 2013 · a732aaa · a732aaa
1 parent 7cdc0f5
commit a732aaa
Showing 1 changed file with 15 additions and 18 deletions.
diff --git a/src/main/java/com/sk89q/worldedit/EditSession.java b/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -19,6 +19,7 @@
 package com.sk89q.worldedit;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
@@ -533,6 +534,18 @@ public int countBlock(Region region, Set<Integer> searchIDs) {
         return countBlocks(region, passOn);
     }
 
+    private static boolean containsFuzzy(Collection<BaseBlock> collection, Object o) {
+        // allow -1 data in the searchBlocks to match any type
+        for (BaseBlock b : collection) {
+            if (o instanceof BaseBlock) {
+                if (b.equalsFuzzy((BaseBlock) o)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * Count the number of blocks of a list of types in a region.
      *
@@ -543,22 +556,6 @@ public int countBlock(Region region, Set<Integer> searchIDs) {
     public int countBlocks(Region region, Set<BaseBlock> searchBlocks) {
         int count = 0;
 
-        // allow -1 data in the searchBlocks to match any type
-        Set<BaseBlock> newSet = new HashSet<BaseBlock>() {
-            @Override
-            public boolean contains(Object o) {
-                for (BaseBlock b : this.toArray(new BaseBlock[this.size()])) {
-                    if (o instanceof BaseBlock) {
-                        if (b.equalsFuzzy((BaseBlock) o)) {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-        };
-        newSet.addAll(searchBlocks);
-
         if (region instanceof CuboidRegion) {
             // Doing this for speed
             Vector min = region.getMinimumPoint();
@@ -577,7 +574,7 @@ public boolean contains(Object o) {
                         Vector pt = new Vector(x, y, z);
 
                         BaseBlock compare = new BaseBlock(getBlockType(pt), getBlockData(pt));
-                        if (newSet.contains(compare)) {
+                        if (containsFuzzy(searchBlocks, compare)) {
                             ++count;
                         }
                     }
@@ -586,7 +583,7 @@ public boolean contains(Object o) {
         } else {
             for (Vector pt : region) {
                 BaseBlock compare = new BaseBlock(getBlockType(pt), getBlockData(pt));
-                if (newSet.contains(compare)) {
+                if (containsFuzzy(searchBlocks, compare)) {
                     ++count;
                 }
             }