Added new Mask interface and deprecated old one.

This commit is contained in:
sk89q
2014-03-30 01:36:02 -07:00
parent 9ab1d0f150
commit 9113cd4bd3
35 changed files with 753 additions and 182 deletions

View File

@ -1,7 +1,6 @@
package com.sk89q.worldedit.masks;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.Extent;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.blocks.BaseBlock;
@ -9,7 +8,11 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
public class BlockMask extends ExtentAwareMask {
/**
* @deprecated Use {@link com.sk89q.worldedit.function.mask.BlockMask}
*/
@Deprecated
public class BlockMask extends AbstractMask {
private final Set<BaseBlock> blocks;
@ -43,8 +46,7 @@ public class BlockMask extends ExtentAwareMask {
@Override
public boolean matches(EditSession editSession, Vector pos) {
Extent extent = getExtent(editSession);
BaseBlock block = extent.getBlock(pos);
BaseBlock block = editSession.getBlock(pos);
return blocks.contains(block)
|| blocks.contains(new BaseBlock(block.getType(), -1));
}