Add region.members, .owners

Also fix the region object in general
DenizenScript · Oct 18, 2014 · a329265 · a329265
1 parent 4f3f415
commit a329265
Showing 1 changed file with 34 additions and 1 deletion.
diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/worldguard/WorldGuardRegion.java b/src/main/java/net/gnomeffinway/depenizen/objects/worldguard/WorldGuardRegion.java
@@ -47,6 +47,7 @@ public static WorldGuardRegion valueOf(String string) {
                         + "' for world '" + worldName + "'");
                 return null;
             }
+            return new WorldGuardRegion(manager.getRegion(regionName), world);
         }
 
         return null;
@@ -151,6 +152,38 @@ public String getAttribute(Attribute attribute) {
             return new Element(region.getId()).getAttribute(attribute.fulfill(1));
         }
 
+        // <--[tag]
+        // @attribute <region@region.members>
+        // @returns dList(dPlayer)
+        // @description
+        // Gets a list of all members of a region. (Members are permitted to build, etc.)
+        // -->
+        if (attribute.startsWith("members")) {
+            dList list = new dList();
+            for (String str: region.getMembers().getPlayers()) {
+                dPlayer player = dPlayer.valueOf(str);
+                if (player != null)
+                    list.add(player.identify());
+            }
+            return list.getAttribute(attribute.fulfill(1));
+        }
+
+        // <--[tag]
+        // @attribute <region@region.owners>
+        // @returns dList(dPlayer)
+        // @description
+        // Gets a list of all owners of a region. (Owners are permitted to build, edit settings, etc.)
+        // -->
+        if (attribute.startsWith("owners")) {
+            dList list = new dList();
+            for (String str: region.getOwners().getPlayers()) {
+                dPlayer player = dPlayer.valueOf(str);
+                if (player != null)
+                    list.add(player.identify());
+            }
+            return list.getAttribute(attribute.fulfill(1));
+        }
+
         // <--[tag]
         // @attribute <region@region.world>
         // @returns dWorld
@@ -161,7 +194,7 @@ public String getAttribute(Attribute attribute) {
             return new dWorld(world).getAttribute(attribute.fulfill(1));
         }
 
-        return new Element(identify()).getAttribute(attribute.fulfill(1));
+        return new Element(identify()).getAttribute(attribute);
 
     }
 }