From 2b09f10e6da346a5e363930368f44dd3b685969a Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Sat, 1 Nov 2014 19:26:32 -0700 Subject: [PATCH] Return raw null even more Yay more for fallbacks --- .../denizen/objects/properties/entity/EntityTame.java | 3 +-- .../objects/properties/inventory/InventoryContents.java | 2 +- .../objects/properties/inventory/InventoryHolder.java | 2 +- .../net/aufdemrand/denizen/scripts/queues/ScriptQueue.java | 6 +++--- .../java/net/aufdemrand/denizen/tags/core/QueueTags.java | 2 +- .../java/net/aufdemrand/denizen/tags/core/ScriptTags.java | 2 +- .../java/net/aufdemrand/denizen/tags/core/UtilTags.java | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityTame.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityTame.java index 1c8f771f93..7b26b6cbbb 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityTame.java +++ b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityTame.java @@ -90,8 +90,7 @@ public String getAttribute(Attribute attribute) { return new dPlayer((OfflinePlayer) ((Tameable) entity.getBukkitEntity()).getOwner()) .getAttribute(attribute.fulfill(1)); else - return Element.NULL - .getAttribute(attribute.fulfill(1)); + return null; } return null; diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryContents.java b/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryContents.java index 1bd692c67a..1428caf632 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryContents.java +++ b/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryContents.java @@ -150,7 +150,7 @@ public String getAttribute(Attribute attribute) { // --> if (attribute.startsWith("with_lore")) { // Must specify lore to check - if (!attribute.hasContext(1)) return Element.NULL.getAttribute(attribute.fulfill(1)); + if (!attribute.hasContext(1)) return null; String lore = attribute.getContext(1); attribute.fulfill(1); // <--[tag] diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryHolder.java b/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryHolder.java index 438d91713f..b09828a5fa 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryHolder.java +++ b/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryHolder.java @@ -132,7 +132,7 @@ public String getAttribute(Attribute attribute) { // --> if (attribute.startsWith("id_holder")) { if (holder == null) - return Element.NULL.getAttribute(attribute.fulfill(1)); + return null; return holder.getAttribute(attribute.fulfill(1)); } diff --git a/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java b/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java index be0b7e5f91..2fbe992347 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java @@ -882,7 +882,7 @@ else if (script_entries.size() > 0) { dB.echoError(this, "Can't determine a linked NPC."); } if (npc == null) - return Element.NULL.getAttribute(attribute.fulfill(1)); + return null; else return npc.getAttribute(attribute.fulfill(1)); } @@ -905,7 +905,7 @@ else if (script_entries.size() > 0) { dB.echoError(this, "Can't determine a linked player."); } if (player == null) - return Element.NULL.getAttribute(attribute.fulfill(1)); + return null; else return player.getAttribute(attribute.fulfill(1)); } @@ -920,7 +920,7 @@ else if (script_entries.size() > 0) { // --> if (attribute.startsWith("determination")) { if (reqId < 0 || !DetermineCommand.hasOutcome(reqId)) - return Element.NULL.getAttribute(attribute.fulfill(1)); + return null; else return ObjectFetcher.pickObjectFor(DetermineCommand.readOutcome(reqId)).getAttribute(attribute.fulfill(1)); } diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/QueueTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/QueueTags.java index 5865a9a94a..ba46af2c4c 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/QueueTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/QueueTags.java @@ -31,7 +31,7 @@ public void queueTag(ReplaceableTagEvent event) { if (event.hasNameContext()) { if (ScriptQueue._queueExists(event.getNameContext())) - event.setReplaced(Element.NULL.getAttribute(attribute.fulfill(1))); + return; else event.setReplaced(ScriptQueue._getExistingQueue(event.getNameContext()) .getAttribute(attribute.fulfill(1))); diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ScriptTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/ScriptTags.java index febc068971..1f6ceeb9a2 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/ScriptTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/ScriptTags.java @@ -46,7 +46,7 @@ else if (event.getScriptEntry().hasObject("script")) Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry()); // Check if location is null, return null if it is - if (script == null) { event.setReplaced(Element.NULL.getAttribute(attribute.fulfill(1))); return; } + if (script == null) { return; } // Else, get the attribute from the script event.setReplaced(script.getAttribute(attribute.fulfill(1))); diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java index b2b2d32694..80f7a9866c 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java @@ -248,7 +248,7 @@ public void serverTag(ReplaceableTagEvent event) { NPC npc = ((Citizens) Bukkit.getPluginManager().getPlugin("Citizens")) .getNPCSelector().getSelected(Bukkit.getConsoleSender()); if (npc == null) - event.setReplaced(Element.NULL.getAttribute(attribute.fulfill(1))); + return; else event.setReplaced(new dNPC(npc).getAttribute(attribute.fulfill(1))); return;