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

Added support for combined masks.

Browse Source
This commit is contained in:
sk89q
2011-06-04 11:42:45 -07:00
parent d881c14e2d
commit 504b4a613f
3 changed files with 90 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/sk89q/worldedit/WorldEdit.java
View File

@ -403,33 +403,50 @@ public class WorldEdit {
* blocks to include when replacing.
*
* @param player
* @param list
* @param maskString
* @return
* @throws UnknownItemException
* @throws DisallowedItemException
*/
public Mask getBlockMask(LocalPlayer player, String list)
public Mask getBlockMask(LocalPlayer player, String maskString)
throws UnknownItemException, DisallowedItemException {
if (list.charAt(0) == '#') {
if (list.equalsIgnoreCase("#existing")) {
return new ExistingBlockMask();
Mask mask = null;
for (String component : maskString.split(" ")) {
Mask current = null;
if (component.charAt(0) == '#') {
if (component.equalsIgnoreCase("#existing")) {
current = new ExistingBlockMask();
} else {
throw new UnknownItemException(component);
}
} else {
throw new UnknownItemException(list);
if (component.charAt(0) == '!' && component.length() > 1) {
current = new InvertedBlockTypeMask(
getBlockIDs(player, component.substring(1), true));
} else {
current = new BlockTypeMask(getBlockIDs(player, component, true));
}
}
} else {
if (list.charAt(0) == '!' && list.length() > 1) {
return new InvertedBlockTypeMask(
getBlockIDs(player, list.substring(1), true));
if (mask == null) {
mask = current;
} else if (mask instanceof CombinedMask) {
((CombinedMask) mask).add(current);
} else {
return new BlockTypeMask(getBlockIDs(player, list, true));
mask = new CombinedMask(mask);
((CombinedMask) mask).add(current);
}
}
return mask;
}
/**
* Get a list of blocks as a set.
*
*@param player
* @param player
* @param list
* @param allBlocksAllowed
* @return set