Add entity.can_see, adjust tag some meta

DenizenScript · Aug 10, 2013 · 6e66ce6 · 6e66ce6
1 parent e60bd65
commit 6e66ce6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -922,6 +922,17 @@ else if ((float) getLivingEntity().getHealth() / maxHealth < 1)
             return new Duration(entity.getTicksLived() / 20)
                     .getAttribute(attribute.fulfill(1));
 
+        // <--
+        // <entity.can_see[entity]> -> Element(Boolean)
+        // Returns true if the entity can see the other entity.
+        // -->
+        if (attribute.startsWith("can_see")) {
+            if (attribute.hasContext(1) && dEntity.matches(attribute.getContext(1))) {
+                dEntity toEntity = dEntity.valueOf(attribute.getContext(1));
+                return new Element(String.valueOf(getLivingEntity().hasLineOfSight(toEntity.getBukkitEntity()))).getAttribute(attribute.fulfill(1));
+            }
+        }
+
         // <--
         // <entity.can_pickup_items> -> Element(Boolean)
         // Returns true if the entity can pick up items. Else, returns false.

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java
@@ -585,21 +585,21 @@ public int compare(dEntity ent1, dEntity ent2) {
         }
 
         // <--
-        // <l@location.distance[X]> -> Element(Number)
+        // <l@location.distance[<location>]> -> Element(Number)
         // Returns the distance between 2 locations.
         // -->
         if (attribute.startsWith("distance")) {
             if (attribute.hasContext(1) && dLocation.matches(attribute.getContext(1))) {
                 dLocation toLocation = dLocation.valueOf(attribute.getContext(1));
 
                 // <--
-                // <l@location.distance[X].horizontal> -> Element(Number)
+                // <l@location.distance[<location>].horizontal> -> Element(Number)
                 // Returns the horizontal distance between 2 locations.
                 // -->
                 if (attribute.getAttribute(2).startsWith("horizontal")) {
 
                 	// <--
-                    // <l@location.distance[X].horizontal.multiworld> -> Element(Number)
+                    // <l@location.distance[<location>].horizontal.multiworld> -> Element(Number)
                     // Returns the horizontal distance between 2 multiworld locations.
                     // -->
                     if (attribute.getAttribute(3).startsWith("multiworld"))
@@ -615,13 +615,13 @@ else if (this.getWorld() == toLocation.getWorld())
                 }
 
                 // <--
-                // <l@location.distance[X].vertical> -> Element(Number)
+                // <l@location.distance[<location>].vertical> -> Element(Number)
                 // Returns the vertical distance between 2 locations.
                 // -->
                 else if (attribute.getAttribute(2).startsWith("vertical")) {
 
                 	// <--
-                    // <l@location.distance[X].vertical.multiworld> -> Element(Number)
+                    // <l@location.distance[<location>].vertical.multiworld> -> Element(Number)
                     // Returns the vertical distance between 2 multiworld locations.
                     // -->
                     if (attribute.getAttribute(3).startsWith("multiworld"))

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/player/CompassCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/player/CompassCommand.java
@@ -52,6 +52,4 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
 
 
 	}
-
-
-}
+}