Add <location.find.players.within[X]>

DenizenScript · Jul 20, 2013 · d153e85 · d153e85
1 parent 909088c
commit d153e85
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java
@@ -1,5 +1,6 @@
 package net.aufdemrand.denizen.objects;
 
+import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.tags.Attribute;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
@@ -10,6 +11,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.entity.Player;
 import org.bukkit.World;
 import org.bukkit.block.Sign;
 
@@ -415,6 +417,18 @@ else if (attribute.startsWith("surface_blocks")
                                         && l.add(0,1,0).getBlock().getType() == Material.AIR)
                                     found.add(new dLocation(getBlock().getRelative(x,y,z).getLocation()));
                             }
+
+
+            }
+
+            else if (attribute.startsWith("players")
+            	&& attribute.getAttribute(2).startsWith("within")
+            	&& attribute.hasContext(2)) {
+            	int radius = aH.matchesInteger(attribute.getContext(2)) ? attribute.getIntContext(2) : 10;
+                double radiusSquared = radius*radius;
+                attribute.fulfill(2);
+                for (Player player : Bukkit.getOnlinePlayers())
+                	found.add(new dPlayer(player));
             }
 
             else return "null";

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/ScriptQueue.java b/src/main/java/net/aufdemrand/denizen/scripts/ScriptQueue.java
@@ -1,9 +1,9 @@
 package net.aufdemrand.denizen.scripts;
 
-import net.aufdemrand.denizen.Settings;
-import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.objects.Duration;
 import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
+import net.aufdemrand.denizen.Settings;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Listener;