Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-08 18:00:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed mask support from BlockCount.

Browse Source 
RegionMaskFilter handles it.
This commit is contained in:
sk89q 2014-03-27 21:11:02 -07:00
parent a6e979ec6c
commit 9cd164ae98
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -551,10 +551,11 @@ public class EditSession {
*/ */
public int countBlocks(Region region, Set<BaseBlock> searchBlocks) { public int countBlocks(Region region, Set<BaseBlock> searchBlocks) {
FuzzyBlockMask mask = new FuzzyBlockMask(searchBlocks); FuzzyBlockMask mask = new FuzzyBlockMask(searchBlocks);
BlockCount counter = new BlockCount(this, mask); BlockCount count = new BlockCount();
RegionVisitor visitor = new RegionVisitor(region, counter); RegionMaskFilter filter = new RegionMaskFilter(this, mask, count);
RegionVisitor visitor = new RegionVisitor(region, filter);
OperationHelper.completeBlindly(visitor); // We can't throw exceptions, nor do we expect any OperationHelper.completeBlindly(visitor); // We can't throw exceptions, nor do we expect any
return counter.getCount(); return count.getCount();
} }
/** /**

21
src/main/java/com/sk89q/worldedit/operation/BlockCount.java
View File

@ -19,30 +19,15 @@
package com.sk89q.worldedit.operation; package com.sk89q.worldedit.operation;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.masks.Mask;
/** /**
* Counts the number of blocks that match a given mask. * Counts the number of blocks.
*/ */
public class BlockCount implements RegionFunction { public class BlockCount implements RegionFunction {
private final EditSession editSession;
private Mask mask;
private int count; private int count;
/**
* Create a new block counter.
*
* @param editSession the edit session
* @param mask the mask
*/
public BlockCount(EditSession editSession, Mask mask) {
this.editSession = editSession;
this.mask = mask;
}
/** /**
* Returns the number of blocks that have been counted. * Returns the number of blocks that have been counted.
@ -55,9 +40,7 @@ import com.sk89q.worldedit.masks.Mask;
@Override @Override
public boolean apply(Vector position) throws WorldEditException { public boolean apply(Vector position) throws WorldEditException {
if (mask.matches(editSession, position)) { count++;
count++;
}
return false; return false;
} }