Don't complain when YAML tags have fallbacks

Maybe we intentionally specified nonsense so the fallback would show.
DenizenScript · Dec 8, 2014 · 455fb32 · 455fb32
1 parent 6e5a467
commit 455fb32
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java
@@ -440,7 +440,8 @@ public void yaml(ReplaceableTagEvent event) {
         }
 
         // YAML tag requires name context and type context.
-        if (!event.hasNameContext() || !(event.hasTypeContext() || attribute.getAttribute(2).equalsIgnoreCase("to_json"))) {
+        if ((!event.hasNameContext() || !(event.hasTypeContext() || attribute.getAttribute(2).equalsIgnoreCase("to_json")))
+                && !attribute.hasAlternative()) {
             dB.echoError("YAML tag '" + event.raw_tag + "' is missing required context. Tag replacement aborted.");
             return;
         }
@@ -450,7 +451,8 @@ public void yaml(ReplaceableTagEvent event) {
         String path = event.getTypeContext();
 
         // Check if there is a yaml file loaded with the specified id
-        if (!yamls.containsKey(id.toUpperCase())) {
+        if (!yamls.containsKey(id.toUpperCase())
+                && !attribute.hasAlternative()) {
             dB.echoError("YAML tag '" + event.raw_tag + "' has specified an invalid ID, or the specified id has already" +
                     " been closed. Tag replacement aborted. ID given: '" + id + "'.");
             return;