Skip to content

Commit a95e8b2

Browse files
committed
make a special-case for "or" to not need a namespace
1 parent da64f1f commit a95e8b2

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

src/main/java/io/github/cottonmc/libcd/condition/ConditionalData.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ public static boolean shouldLoad(Identifier resourceId, String meta) {
9090
}
9191
JsonObject obj = (JsonObject)condition;
9292
for (String key : obj.keySet()) {
93-
if (!testCondition(new Identifier(key), obj)) return false;
93+
Identifier id = key.equals("or")? new Identifier(LibCD.MODID, "or") : new Identifier(key);
94+
if (!testCondition(id, obj)) return false;
9495
}
9596
}
9697
}

0 commit comments

Comments
 (0)