mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2024-12-21 04:49:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved containsFuzzy from EditSession to BaseBlock.

Browse Source
This commit is contained in:
TomyLobo 2013-12-03 23:36:37 +01:00
parent d467bf1386
commit 68b8218bea
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -19,7 +19,6 @@
package com.sk89q.worldedit;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Deque;
import java.util.HashMap;
@ -542,18 +541,6 @@ 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.
*
@ -582,7 +569,7 @@ public int countBlocks(Region region, Set<BaseBlock> searchBlocks) {
Vector pt = new Vector(x, y, z);
BaseBlock compare = new BaseBlock(getBlockType(pt), getBlockData(pt));
if (containsFuzzy(searchBlocks, compare)) {
if (BaseBlock.containsFuzzy(searchBlocks, compare)) {
++count;
}
}
@ -591,7 +578,7 @@ public int countBlocks(Region region, Set<BaseBlock> searchBlocks) {
} else {
for (Vector pt : region) {
BaseBlock compare = new BaseBlock(getBlockType(pt), getBlockData(pt));
if (containsFuzzy(searchBlocks, compare)) {
if (BaseBlock.containsFuzzy(searchBlocks, compare)) {
++count;
}
}

14
src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
View File

@ -22,6 +22,8 @@
import com.sk89q.worldedit.CuboidClipboard.FlipDirection;
import com.sk89q.worldedit.foundation.Block;
import java.util.Collection;
/**
* Represents a block.
*
@ -161,7 +163,7 @@ public boolean equalsFuzzy(BaseBlock o) {
/**
* @param iter
* @return
* @deprecated This method is silly
* @deprecated This method is silly, use {@link #containsFuzzy(java.util.Collection, BaseBlock)} instead.
*/
@Deprecated
public boolean inIterable(Iterable<BaseBlock> iter) {
@ -172,4 +174,14 @@ public boolean inIterable(Iterable<BaseBlock> iter) {
}
return false;
}
public static boolean containsFuzzy(Collection<BaseBlock> collection, BaseBlock o) {
// allow masked data in the searchBlocks to match various types
for (BaseBlock b : collection) {
if (b.equalsFuzzy(o)) {
return true;
}
}
return false;
}
}