Allow plugins to add on to Location, NPC, and server tags

DenizenScript · Aug 12, 2013 · e64da68 · e64da68
1 parent b2fa7ca
commit e64da68
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java
@@ -81,8 +81,10 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
 		for (int x = 0; x < possibilities; x++) {
 
 			if (bracketsEntered > 0) {
-				if (queue.getEntry(0).getArguments().contains("}"))
+				if (queue.getEntry(0).getArguments().contains("}")) {
+					dB.echoDebug("Leaving brackets...");
 					bracketsEntered--;
+				}
 
 				if (selectedBrackets) {
 					keeping.add(queue.getEntry(0));

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java
@@ -24,7 +24,8 @@ public LocationTags(Denizen denizen) {
 
     @EventHandler
     public void locationTags(ReplaceableTagEvent event) {
-        if (!event.matches("location, l")) return;
+
+        if (!event.matches("location, l") || event.replaced()) return;
 
         // Stage the location
         dLocation loc = null;

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/NPCTags.java
@@ -29,7 +29,8 @@ public NPCTags(Denizen denizen) {
 
     @EventHandler
     public void npcTags(ReplaceableTagEvent event) {
-        if (!event.matches("npc")) return;
+
+        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());

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java
@@ -88,7 +88,7 @@ public void queueTags(ReplaceableTagEvent event) {
 
     @EventHandler
     public void serverTags(ReplaceableTagEvent event) {
-        if (!event.matches("server, svr, global")) return;
+        if (!event.matches("server, svr, global") || event.replaced()) return;
         Attribute attribute =
                 new Attribute(event.raw_tag, event.getScriptEntry()).fulfill(1);