Cleaning + use new core time tracker

DenizenScript · May 5, 2016 · c7e0a23 · c7e0a23
1 parent 27f3549
commit c7e0a23
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/flags/FlagManager.java b/src/main/java/net/aufdemrand/denizen/flags/FlagManager.java
@@ -8,6 +8,7 @@
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.depends.Depends;
+import net.aufdemrand.denizencore.DenizenCore;
 import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizencore.objects.*;
 import org.bukkit.configuration.ConfigurationSection;
@@ -707,7 +708,7 @@ public String toString() {
         public boolean checkExpired() {
             rebuild();
             if (denizen.getSaves().contains(flagPath + "-expiration")) {
-                if (expiration > 1 && expiration < System.currentTimeMillis()) {
+                if (expiration > 1 && expiration < DenizenCore.currentTimeMillis) {
                     String OldOwner = flagOwner;
                     String OldName = flagName;
                     dObject OldValue = value.size() > 1
@@ -769,7 +770,7 @@ else if (entity != null) {
         }
 
         public Duration expiration() {
-            return new Duration((double) (expiration - System.currentTimeMillis()) / 1000);
+            return new Duration((double) (expiration - DenizenCore.currentTimeMillis) / 1000);
         }
 
         /**
@@ -781,7 +782,7 @@ public Duration expiration() {
         public String expirationTime() {
             rebuild();
 
-            long seconds = (expiration - System.currentTimeMillis()) / 1000;
+            long seconds = (expiration - DenizenCore.currentTimeMillis) / 1000;
 
             long days = seconds / 86400;
             long hours = (seconds - days * 86400) / 3600;

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/MobproxTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/MobproxTrait.java
@@ -22,7 +22,7 @@
 
 public class MobproxTrait extends Trait {
     public MobproxTrait() {
-        super("Mobprox");
+        super("mobprox");
     }
 
     int checkTimer = 0;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -1505,6 +1505,7 @@ public String getAttribute(Attribute attribute) {
         // Returns the name of the entity script that spawned this entity, if any.
         // -->
         if (attribute.startsWith("script")) {
+            // TODO: Maybe return legit null?
             return new Element(entityScript == null ? "null" : entityScript)
                     .getAttribute(attribute.fulfill(1));
         }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/FlagCommand.java
@@ -8,6 +8,7 @@
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.debugging.dB;
+import net.aufdemrand.denizencore.DenizenCore;
 import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizencore.objects.Duration;
@@ -256,8 +257,8 @@ else if (flag_target instanceof dEntity) {
 
         // Set flag duration
         if (flag.StillValid() && duration != null && duration.getSeconds() > 0) {
-            flag.setExpiration(System.currentTimeMillis()
-                    + Double.valueOf(duration.getSeconds() * 1000).longValue());
+            flag.setExpiration(DenizenCore.currentTimeMillis
+                    + Double.valueOf(duration.getSeconds() * 1000.0).longValue());
         }
 
         else if (flag.StillValid() && flag.expiration().getMillis() != 0L) {

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ServerTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/ServerTags.java
@@ -336,6 +336,7 @@ public void serverTag(ReplaceableTagEvent event) {
         // @returns Element(Number)
         // @description
         // Returns the number of milliseconds since Jan 1, 1970.
+        // Note that this can change every time the tag is read!
         // -->
         if (attribute.startsWith("current_time_millis")) {
             event.setReplaced(new Element(System.currentTimeMillis())