Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-06 00:58:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix area id parsing

Browse Source
This commit is contained in:
Jesse Boyd 2016-09-19 14:18:47 +10:00
parent d89274ce09
commit 364b4347d1
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Core/src/main/java/com/intellectualcrafters/plot/PS.java
View File

@ -1526,16 +1526,13 @@ public class PS {
} }
for (String areaId : areasSection.getKeys(false)) { for (String areaId : areasSection.getKeys(false)) {
PS.log(C.PREFIX + "&3 - " + areaId); PS.log(C.PREFIX + "&3 - " + areaId);
int i1 = areaId.indexOf('-'); String[] split = areaId.split("(?<=[^;-])-");
int i2 = areaId.indexOf(';'); if (split.length != 3) {
if (i1 == -1 || i2 == -1) {
throw new IllegalArgumentException("Invalid Area identifier: " + areaId + ". Expected form `<name>-<pos1>-<pos2>`"); throw new IllegalArgumentException("Invalid Area identifier: " + areaId + ". Expected form `<name>-<pos1>-<pos2>`");
} }
String name = areaId.substring(0, i1); String name = split[0];
String rest = areaId.substring(i1 + 1); PlotId pos1 = PlotId.fromString(split[1]);
int i3 = rest.indexOf('-', i2 - name.length() - 1); PlotId pos2 = PlotId.fromString(split[2]);
PlotId pos1 = PlotId.fromString(rest.substring(0, i3));
PlotId pos2 = PlotId.fromString(rest.substring(i3 + 1));
if (pos1 == null || pos2 == null || name.isEmpty()) { if (pos1 == null || pos2 == null || name.isEmpty()) {
throw new IllegalArgumentException("Invalid Area identifier: " + areaId + ". Expected form `<name>-<x1;z1>-<x2;z2>`"); throw new IllegalArgumentException("Invalid Area identifier: " + areaId + ". Expected form `<name>-<x1;z1>-<x2;z2>`");
} }