EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-07-01 13:14:43 +02:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Jesse Boyd
2015-12-20 06:30:06 +11:00
parent ce387333d2
commit cf517d5be0
33 changed files with 680 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/intellectualcrafters/plot/flag/FlagValue.java
View File

@ -6,6 +6,8 @@ import java.util.HashSet;
import java.util.List;
import com.intellectualcrafters.plot.object.PlotBlock;
import com.intellectualcrafters.plot.util.BlockManager;
import com.intellectualcrafters.plot.util.StringComparison;
import com.intellectualcrafters.plot.util.StringMan;
/**
@ -276,7 +278,11 @@ public abstract class FlagValue<T> {
}
final short id = Short.parseShort(split[0]);
return new PlotBlock(id, data);
} catch (final Exception e) {
} catch (final Exception e) {
final StringComparison<PlotBlock>.ComparisonResult value = BlockManager.manager.getClosestBlock(t);
if ((value == null) || (value.match > 1)) {
return null;
}
return value.best;
}
}
@ -309,19 +315,28 @@ public abstract class FlagValue<T> {
@Override
public HashSet<PlotBlock> parse(final String t) {
final HashSet<PlotBlock> list = new HashSet<PlotBlock>();
for (final String item : t.split(",")) {
final String[] split = item.split(":");
byte data;
if (split.length == 2) {
if ("*".equals(split[1])) {
for (final String item : t.split(",")) {
PlotBlock block;
try {
final String[] split = item.split(":");
byte data;
if (split.length == 2) {
if ("*".equals(split[1])) {
data = -1;
} else {
data = Byte.parseByte(split[1]);
}
} else {
} else {
data = -1;
}
} else {
}
final short id = Short.parseShort(split[0]);
block = new PlotBlock(id, data);
} catch (Exception e) {
final StringComparison<PlotBlock>.ComparisonResult value = BlockManager.manager.getClosestBlock(t);
if ((value == null) || (value.match > 1)) {
continue;
}
block = value.best;
}
final short id = Short.parseShort(split[0]);
}
list.add(block);
}