Don't forget fallbacks exist

Shut up with yer errors
DenizenScript · Jan 3, 2015 · 83fd52e · 83fd52e
1 parent 72c5ac0
commit 83fd52e
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 16 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -1104,8 +1104,9 @@ else if (isOnline())
             String permission = attribute.getContext(1);
 
             if (Depends.permissions == null) {
-                if (!attribute.hasAlternative())
+                if (!attribute.hasAlternative()) {
                     dB.echoError("No permission system loaded! Have you installed Vault and a compatible permissions plugin?");
+                }
                 return null;
             }
 

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ContextTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/ContextTags.java
@@ -30,7 +30,7 @@ public void contextTags(ReplaceableTagEvent event) {
 
         // First, check queue object context.
         if (event.getScriptEntry().getResidingQueue().hasContext(object)) {
-            Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry());
+            Attribute attribute = event.getAttributes();
             event.setReplaced(event.getScriptEntry().getResidingQueue()
                     .getContext(object).getAttribute(attribute.fulfill(2)));
             return;
@@ -73,7 +73,7 @@ public void savedEntryTags(ReplaceableTagEvent event) {
             // Get the entry_id from name context
             String id = event.getNameContext();
 
-            Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry());
+            Attribute attribute = event.getAttributes();
             ScriptEntry held = event.getScriptEntry().getResidingQueue().getHeldScriptEntry(id);
             if (held == null) { // Check if the ID is bad
                 dB.echoDebug(event.getScriptEntry(), "Bad saved entry ID '" + id + "'");

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java
@@ -43,7 +43,7 @@ public void npcTags(ReplaceableTagEvent event) {
         if (!event.matches("npc") || event.replaced()) return;
 
         // Build a new attribute out of the raw_tag supplied in the script to be fulfilled
-        Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry());
+        Attribute attribute = event.getAttributes();
 
         // NPCTags require a... dNPC!
         dNPC n = ((BukkitTagContext)event.getContext()).npc;

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java
@@ -40,7 +40,7 @@ public void notableTags(ReplaceableTagEvent event) {
 
         dLocation location = (dLocation) NotableManager.getSavedObject(id);
 
-        Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry());
+        Attribute attribute = event.getAttributes();
         attribute.fulfill(1);
         tag = location.getAttribute(attribute);
 

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java
@@ -62,7 +62,7 @@ public void playerTags(ReplaceableTagEvent event) {
         if (!event.matches("player", "pl") || event.replaced()) return;
 
         // Build a new attribute out of the raw_tag supplied in the script to be fulfilled
-        Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry());
+        Attribute attribute = event.getAttributes();
 
         // PlayerTags require a... dPlayer!
         dPlayer p = ((BukkitTagContext)event.getContext()).player;

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/QueueTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/QueueTags.java
@@ -26,7 +26,7 @@ public void queueTag(ReplaceableTagEvent event) {
 
         if (!event.matches("queue", "q")) return;
 
-        Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry()).fulfill(1);
+        Attribute attribute = event.getAttributes().fulfill(1);
 
         // Handle <queue[id]. ...> tags
 

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ScriptTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/ScriptTags.java
@@ -42,7 +42,7 @@ else if (event.getScriptEntry().hasObject("script"))
             script = (dScript) event.getScriptEntry().getObject("script");
 
         // Build and fill attributes
-        Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry());
+        Attribute attribute = event.getAttributes();
 
         // Check if location is null, return null if it is
         if (script == null) { return; }

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/TextTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/TextTags.java
@@ -20,8 +20,7 @@ public void foreignCharacterTags(ReplaceableTagEvent event) {
 
 
         if (!event.getName().startsWith("&")) return;
-        Attribute attribute =
-                new Attribute(event.raw_tag, event.getScriptEntry());
+        Attribute attribute = event.getAttributes();
 
         // <--[tag]
         // @attribute <&auml>
@@ -411,8 +410,7 @@ else if (event.matches("&" + code[i]))
     @TagManager.TagEvents
     public void specialCharacterTags(ReplaceableTagEvent event) {
         if (!event.getName().startsWith("&")) return;
-        Attribute attribute =
-                new Attribute(event.raw_tag, event.getScriptEntry());
+        Attribute attribute = event.getAttributes();
 
         // <--[tag]
         // @attribute <&nl>

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java
@@ -97,8 +97,7 @@ public void ternaryTag(ReplaceableTagEvent event) {
     @TagManager.TagEvents
     public void serverTag(ReplaceableTagEvent event) {
         if (!event.matches("server", "svr", "global") || event.replaced()) return;
-        Attribute attribute =
-                new Attribute(event.raw_tag, event.getScriptEntry()).fulfill(1);
+        Attribute attribute = event.getAttributes().fulfill(1);
 
         // <--[tag]
         // @attribute <server.has_flag[<flag_name>]>
@@ -800,7 +799,7 @@ public void utilTag(ReplaceableTagEvent event) {
         String subTypeContext = event.getSubTypeContext() != null ? event.getSubTypeContext().toUpperCase() : "";
         String specifier = event.getSpecifier() != null ? event.getSpecifier() : "";
         String specifierContext = event.getSpecifierContext() != null ? event.getSpecifierContext().toUpperCase() : "";
-        Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry()).fulfill(1);
+        Attribute attribute = event.getAttributes().fulfill(1);
 
         if (type.equalsIgnoreCase("RANDOM")) {
 

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/_templateTag.java b/src/main/java/net/aufdemrand/denizen/tags/core/_templateTag.java
@@ -83,7 +83,7 @@ public void constantTags(ReplaceableTagEvent event) {
             // code to handle each situation. A full list of attributes can be found
             // in Denizen's documentation. First you need to turn the tag into an
             // attribute object.
-            Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry());
+            Attribute attribute = event.getAttributes();
 
             // Now to catch up, 2 attributes have been handled already...
             // Fulfilling 2 attributes, skills and .for, in <skills.for[player].get[1]>