Add new containsObjectsFrom(...) to make sure matchesArgumentList doe…

…sn't unintentionally return false, leaving an argument to be misinterpreted. Remember: ALWAYS check your dLists for valid information!

src/main/java/net/aufdemrand/denizen/objects/aH.java

@@ -227,7 +227,7 @@ public boolean matchesArgumentList(Class<? extends dObject> dClass) {
 
             dList list = new dList(this.getValue().replace("li@", ""));
 
-            return list.filter(dClass) != null;
+            return list.containsObjectsFrom(dClass);
         }
 
 
@@ -251,6 +251,12 @@ public <T extends dObject> T asType(Class<? extends dObject> clazz) {
         public void reportUnhandled() {
             dB.echoError('\'' + raw_value + "' is an unknown argument!");
         }
+
+
+        @Override
+        public String toString() {
+            return raw_value;
+        }
     }
 
 

src/main/java/net/aufdemrand/denizen/objects/dList.java

@@ -161,6 +161,20 @@ public String[] toArray() {
         return list.toArray(new String[list.size()]);
     }
 
+    // Returns if the list contains objects from the specified dClass
+    // by using the matches() method.
+    public boolean containsObjectsFrom(Class<? extends dObject> dClass) {
+
+        List<dObject> results = new ArrayList<dObject>();
+
+        // Iterate through elements until one matches() the dClass
+        for (String element : this)
+            if (ObjectFetcher.checkMatch(dClass, element))
+                return true;
+
+        return false;
+    }
+
     // Return a list that includes only strings that match the values
     // of an Enum array
     public List<String> filter(Enum[] values) {
@@ -401,15 +415,15 @@ public String getAttribute(Attribute attribute) {
         // -->
         if (attribute.startsWith("find") &&
                 attribute.hasContext(1)) {
-                for (int i = 0; i < size(); i++) {
-                    if (get(i).equalsIgnoreCase(attribute.getContext(1)))
-                        return new Element(i + 1).getAttribute(attribute.fulfill(1));
-                }
-                for (int i = 0; i < size(); i++) {
-                    if (get(i).toUpperCase().contains(attribute.getContext(1).toUpperCase()))
-                        return new Element(i + 1).getAttribute(attribute.fulfill(1));
-                }
-                return new Element(-1).getAttribute(attribute.fulfill(1));
+            for (int i = 0; i < size(); i++) {
+                if (get(i).equalsIgnoreCase(attribute.getContext(1)))
+                    return new Element(i + 1).getAttribute(attribute.fulfill(1));
+            }
+            for (int i = 0; i < size(); i++) {
+                if (get(i).toUpperCase().contains(attribute.getContext(1).toUpperCase()))
+                    return new Element(i + 1).getAttribute(attribute.fulfill(1));
+            }
+            return new Element(-1).getAttribute(attribute.fulfill(1));
         }
 
         // <--[tag]
@@ -492,7 +506,7 @@ public String getAttribute(Attribute attribute) {
                 }
                 else {
                     return new Element(this.get(Utilities.getRandom().nextInt(this.size())))
-                        .getAttribute(attribute.fulfill(1));
+                            .getAttribute(attribute.fulfill(1));
                 }
             }
         }
@@ -546,4 +560,5 @@ public String getAttribute(Attribute attribute) {
                 : new Element(identify()).getAttribute(attribute));
     }
 
+
 }