Handle as_int error with a fallback gracefully

as_int was previously not fallback-compatible as_double and as_money too
DenizenScript · Sep 27, 2014 · 3b1fbb1 · 3b1fbb1
1 parent 830d84e
commit 3b1fbb1
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/Element.java b/src/main/java/net/aufdemrand/denizen/objects/Element.java
@@ -371,8 +371,8 @@ public String getAttribute(Attribute attribute) {
             try { return new Element(Double.valueOf(element))
                     .getAttribute(attribute.fulfill(1)); }
             catch (NumberFormatException e) {
-                dB.echoError("'" + element + "' is not a valid Double.");
-                return new Element("null").getAttribute(attribute.fulfill(1));
+                if (!attribute.hasAlternative())
+                    dB.echoError("'" + element + "' is not a valid Double.");
             }
 
         // <--[tag]
@@ -391,8 +391,8 @@ public String getAttribute(Attribute attribute) {
                 return new Element(Math.round(Double.valueOf(element)))
                         .getAttribute(attribute.fulfill(1)); }
             catch (NumberFormatException e) {
-                dB.echoError("'" + element + "' is not a valid Integer.");
-                return new Element("null").getAttribute(attribute.fulfill(1));
+                if (!attribute.hasAlternative())
+                    dB.echoError("'" + element + "' is not a valid Integer.");
             }
 
         // <--[tag]
@@ -409,8 +409,8 @@ public String getAttribute(Attribute attribute) {
                 return new Element(d.format(Double.valueOf(element)))
                         .getAttribute(attribute.fulfill(1)); }
             catch (NumberFormatException e) {
-                dB.echoError("'" + element + "' is not a valid number.");
-                return new Element("null").getAttribute(attribute.fulfill(1));
+                if (!attribute.hasAlternative())
+                    dB.echoError("'" + element + "' is not a valid number.");
             }
         }