Add location.formatted.citizens + fix dCuboid

DenizenScript · Oct 22, 2013 · d55ddd6 · d55ddd6
1 parent 67e8e66
commit d55ddd6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -776,6 +776,16 @@ public int compare(dEntity ent1, dEntity ent2) {
         //   IDENTIFICATION ATTRIBUTES
         /////////////////
 
+        // <--[tag]
+        // @attribute <l@location.formatted.citizens>
+        // @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 <l@location.formatted>
         // @returns Element