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

Cleanup overlay/underlay mask.

Browse Source
This commit is contained in:
Wizjany
2011-08-13 00:29:28 -04:00
parent af2429467d
commit 9d753c8692
2 changed files with 41 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,13 +473,13 @@ public class WorldEdit {
public Mask getBlockMask(LocalPlayer player, LocalSession session,
String maskString) throws WorldEditException {
Mask mask = null;
for (String component : maskString.split(" ")) {
Mask current = null;
if (component.length() == 0) {
if (component.length() == 0) {
continue;
}
if (component.charAt(0) == '#') {
if (component.equalsIgnoreCase("#existing")) {
current = new ExistingBlockMask();
@ -487,82 +487,36 @@ public class WorldEdit {
|| component.equalsIgnoreCase("#region")
|| component.equalsIgnoreCase("#sel")) {
current = new RegionMask(session.getSelection(player.getWorld()));
}
else {
} else {
throw new UnknownItemException(component);
}
}
else if (component.charAt(0) == '>') {
} else if (component.charAt(0) == '>'
|| component.charAt(0) == '<') {
LocalWorld world = player.getWorld();
Set<Integer> set = new HashSet<Integer>();
String ids = component.replaceAll(">", "");
if(ids.equalsIgnoreCase("*")){
current = new UnderOverlayMask(set,true,true);
}
else{
String[] split = ids.split(",");
for(String sid :split){
try{
int pid = Integer.parseInt(sid);
if(!world.isValidBlockType(pid)){
throw new UnknownItemException(sid);
}
else{
set.add(pid);
}
}catch(NumberFormatException e){
BlockType type = BlockType.lookup(sid);
int id = type.getID();
if(!world.isValidBlockType(id)){
throw new UnknownItemException(sid);
}
else{
set.add(id);
}
}
current = new UnderOverlayMask(set, true, false);
}
}
}
else if (component.charAt(0) == '<') {
LocalWorld world = player.getWorld();
Set<Integer> set = new HashSet<Integer>();
String ids = component.replaceAll("<", "");
if(ids.equalsIgnoreCase("*")){
current = new UnderOverlayMask(set,false,true);
boolean over = component.charAt(0) == '>';
Set<Integer> set = new HashSet<Integer>();
String ids = component.replaceAll(">", "").replaceAll("<", "");
if (!(ids.equals("*") || ids.equals(""))) {
for (String sid : ids.split(",")) {
try {
int pid = Integer.parseInt(sid);
if (!world.isValidBlockType(pid)) {
throw new UnknownItemException(sid);
}
set.add(pid);
} catch (NumberFormatException e) {
BlockType type = BlockType.lookup(sid);
int id = type.getID();
if (!world.isValidBlockType(id)) {
throw new UnknownItemException(sid);
}
set.add(id);
}
else{
String[] split = ids.split(",");
for(String sid :split){
try{
int pid = Integer.parseInt(sid);
if(!world.isValidBlockType(pid)){
throw new UnknownItemException(sid);
}
else{
set.add(pid);
}
}catch(NumberFormatException e){
BlockType type = BlockType.lookup(sid);
int id = type.getID();
if(!world.isValidBlockType(id)){
throw new UnknownItemException(sid);
}
else{
set.add(id);
}
}
current = new UnderOverlayMask(set, false, false);
}
}
}
else {
}
current = new UnderOverlayMask(set, over);
} else {
if (component.charAt(0) == '!' && component.length() > 1) {
current = new InvertedBlockTypeMask(
getBlockIDs(player, component.substring(1), true));