Sort dPlayer attributes by offline and online attributes, which are t…

…hen sorted by groups, which are then sorted alphabetically.
DenizenScript · Sep 15, 2013 · 26580b9 · 26580b9
1 parent d933820
commit 26580b9
Show file tree

Hide file tree

Showing 2 changed files with 1,022 additions and 927 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -708,7 +708,7 @@ public void target(LivingEntity target) {
         // If the target is not null, cast it to an NMS EntityLiving
         // as well for one of the two methods below
         EntityLiving nmsTarget = target != null ? ((CraftLivingEntity) target).getHandle()
-                                        : null;
+                                                : null;
 
         ((CraftCreature) entity).getHandle().
                 setGoalTarget(nmsTarget);
@@ -1128,13 +1128,13 @@ public String getAttribute(Attribute attribute) {
                     .getAttribute(attribute.fulfill(1));
 
         // <--[tag]
-        // @attribute <e@entity.fire_ticks>
-        // @returns Element(Integer)
+        // @attribute <e@entity.fire_time>
+        // @returns Duration
         // @description
-        // Returns the number of ticks the entity will remain on fire
+        // Returns the duration for which the entity will remain on fire
         // -->
-        if (attribute.startsWith("fire_ticks"))
-            return new Element(entity.getFireTicks())
+        if (attribute.startsWith("fire_time"))
+            return new Duration(entity.getFireTicks() / 20)
                     .getAttribute(attribute.fulfill(1));
 
         // <--[tag]