Catch potential filter tag nulls

Now nothing can be null! he said hopefully
DenizenScript · Jan 1, 2015 · a06e805 · a06e805
1 parent d0aa615
commit a06e805
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dList.java b/src/main/java/net/aufdemrand/denizen/objects/dList.java
@@ -1071,8 +1071,12 @@ else if (res > 0)
             dList newlist = new dList();
             try {
                 for (String str: this) {
-                    if (ObjectFetcher.pickObjectFor(str).getAttribute(new Attribute(attribute.getContext(1),
-                            attribute.getScriptEntry())).equalsIgnoreCase("true")) {
+                    if (str == null) {
+                        dB.echoError("Null string in dList! (From .filter tag)");
+                    }
+                    String result = ObjectFetcher.pickObjectFor(str).getAttribute(new Attribute(attribute.getContext(1),
+                            attribute.getScriptEntry()));
+                    if (result != null && result.equalsIgnoreCase("true")) {
                         newlist.add(str);
                     }
                 }