diff --git a/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java b/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java index a05b299eac..c13ac657a8 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java @@ -97,7 +97,7 @@ public static boolean matches(String string) { // regex patterns used for matching final Pattern location_by_saved = Pattern.compile("(cu@)(.+)"); final Pattern location = - Pattern.compile("((-?\\d+,){3})\\w+\\|((-?\\d+,){3})\\w+", + Pattern.compile("((-?\\d+,){3})[\\w\\s]+\\|((-?\\d+,){3})[\\w\\s]+", Pattern.CASE_INSENSITIVE); Matcher m; diff --git a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java index c17fbfe939..4f89d747e5 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java @@ -776,6 +776,16 @@ public int compare(dEntity ent1, dEntity ent2) { // IDENTIFICATION ATTRIBUTES ///////////////// + // <--[tag] + // @attribute + // @returns Element + // @description + // Returns the location formatted for a Citizens command. + // EG: x.x:y.y:z.z:world + // --> + if (attribute.startsWith("formatted.citizens")) + return new Element(getX() + ":" + getY() + ":" + getZ() + ":" + getWorld().getName()).getAttribute(attribute.fulfill(2)); + // <--[tag] // @attribute // @returns Element