Merge branch 'master' of https://github.com/aufdemrand/Denizen

DenizenScript · Oct 11, 2013 · b2ab5a3 · b2ab5a3
2 parents d50fb31 + d0b45b5
commit b2ab5a3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/CommandHandler.java b/src/main/java/net/aufdemrand/denizen/CommandHandler.java
@@ -143,11 +143,11 @@ public void pushable(CommandContext args, CommandSender sender, NPC npc) throws
     // /npc constant --remove constant_name
     //
     // Viewing constants is easy, just use '/npc constant #', specifying a page number.
-    // Constants which have been overridden in the Assignment Constants list are formatted with a
+    // Constants which have been overridden in the Assignment 'Default Constants' list are formatted with a
     // 'strike-through' to indicate this case.
     //
     // To reference a constant value, use the replaceable tag to get the NPCs 'constant' attribute. For example:
-    // <npc.constant[constant_name]>. Constants may also have other TAGs in their value, which will be 'replaced'
+    // <npc.constant[constant_name]>. Constants may also have other tags in their value, which will be 'replaced'
     // whenever the constant is called to be used allowing for the use of dynamic information.
 
      // -->

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java
@@ -951,6 +951,20 @@ else if (dEntity.matches(attribute.getContext(1))) {
                     .getAttribute(attribute.fulfill(1));
         }
 
+        // <--[tag]
+        // @attribute <l@location.block.sign_contents>
+        // @returns dList
+        // @description
+        // Returns a list of lines on a sign.
+        // -->
+        if (attribute.startsWith("block.sign_contents")) {
+            if (getBlock().getState() instanceof Sign) {
+                return new dList(Arrays.asList(((Sign) getBlock().getState()).getLines()))
+                        .getAttribute(attribute.fulfill(2));
+            }
+            else return "null";
+        }
+
         // <--[tag]
         // @attribute <l@location.block>
         // @returns dLocation
@@ -993,20 +1007,6 @@ else if (dEntity.matches(attribute.getContext(1))) {
             return new Element(getZ()).getAttribute(attribute.fulfill(1));
         }
 
-        // <--[tag]
-        // @attribute <l@location.block.sign_contents>
-        // @returns dList
-        // @description
-        // Returns a list of lines on a sign.
-        // -->
-        if (attribute.startsWith("block.sign_contents")) {
-            if (getBlock().getState() instanceof Sign) {
-                return new dList(Arrays.asList(((Sign) getBlock().getState()).getLines()))
-                        .getAttribute(attribute.fulfill(2));
-            }
-            else return "null";
-        }
-
         // <--[tag]
         // @attribute <l@location.highest>
         // @returns dLocation

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java
@@ -1387,6 +1387,7 @@ public void entityDamage(EntityDamageEvent event) {
             // <context.cause> returns the reason the entity was killed.
             // <context.entity> returns the dEntity that was killed.
             // <context.damage> returns the amount of damage dealt.
+            // <context.damager> returns the dEntity damaging the other entity.
             // <context.shooter> returns the shooter of the entity, if any.
             //
             // @Determine