From 7f2850ba484e2ed3f05428fe2048910aa1689f7e Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Tue, 21 Oct 2014 16:26:35 -0700 Subject: [PATCH] Listen to dScript.yaml_key errors Try to identify errors --- .../net/aufdemrand/denizen/objects/dScript.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/aufdemrand/denizen/objects/dScript.java b/src/main/java/net/aufdemrand/denizen/objects/dScript.java index 709ed96cbc..96cb05fbaf 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dScript.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dScript.java @@ -11,6 +11,7 @@ import net.aufdemrand.denizen.tags.Attribute; import net.aufdemrand.denizen.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; +import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.utilities.YamlConfiguration; public class dScript implements dObject { @@ -340,7 +341,17 @@ else return new Element(TagManager.tag(attribute.getScriptEntry() == null ? null // --> if (attribute.startsWith("yaml_key") && attribute.hasContext(1)) { - Object obj = getContainer().getConfigurationSection("").get(attribute.getContext(1).toUpperCase()); + ScriptContainer container = getContainer(); + if (container == null) { + dB.echoError("Missing script container?!"); + return new Element(identify()).getAttribute(attribute); + } + YamlConfiguration section = container.getConfigurationSection(""); + if (section == null) { + dB.echoError("Missing YAML section?!"); + return new Element(identify()).getAttribute(attribute); + } + Object obj = section.get(attribute.getContext(1).toUpperCase()); if (obj == null) return Element.NULL.getAttribute(attribute.fulfill(1)); if (obj instanceof List) {