Make notable tags work. Example tag: <notable:Wizard Tower>

DenizenScript · Jun 28, 2013 · dcda6c1 · dcda6c1
1 parent ce3fb39
commit dcda6c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java
@@ -41,6 +41,7 @@ public void registerCoreTags() {
         new AnchorTags(denizen);
         new ContextTags(denizen);
         new LocationTags(denizen);
+        new NotableLocationTags(denizen);
         new SpecialCharacterTags(denizen);
         new TextTags(denizen);
         new ForeignCharacterTags(denizen);

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/NotableLocationTags.java
@@ -5,10 +5,7 @@
 import net.aufdemrand.denizen.tags.Attribute;
 import net.aufdemrand.denizen.utilities.arguments.dLocation;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import net.citizensnpcs.api.CitizensAPI;
-import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.trait.Anchors;
-import org.bukkit.Location;
+
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
@@ -19,30 +16,31 @@ public NotableLocationTags(Denizen denizen) {
 	}
 
 	@EventHandler
-	public void constantTags(ReplaceableTagEvent event) {
+	public void notableTags(ReplaceableTagEvent event) {
+
 		if (!event.matches("NOTABLE")) return;
 
         String tag = event.raw_tag;
-
+        
         String id = null;
         if (event.hasValue()) {
             id = event.getValue();
             tag = tag.split(":", 2)[1];
         }
 
         else if (event.hasNameContext()) id = event.getNameContext();
-
+        
         if (dLocation.isSavedLocation(id)) {
             dB.echoError("Notable tag '" + event.raw_tag + "': id was not found.");
         }
 
 		dLocation location = dLocation.getSavedLocation(id);
 
         Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry());
-
         attribute.fulfill(1);
-
-        event.setReplaced(location.getAttribute(attribute));
+        tag = location.getAttribute(attribute);
+
+        event.setReplaced(tag.substring("location:".length()));
 
 	}
 }