Replaceable tag event micro-efficiency

Avoid splitting where possible
DenizenScript · Sep 24, 2014 · e0eb8d9 · e0eb8d9
1 parent a362f9f
commit e0eb8d9
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 12 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java b/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java
@@ -151,6 +151,7 @@ else if (c == '|' && bracks == 0 && bracks2 == 0) {
 
     // Matches method (checks first attribute (name) of the tag)
 
+    // TODO: Remove in 1.0!
     public boolean matches(String tagName) {
         String[] tagNames = StringUtils.split(tagName, ',');
         String name = getName();
@@ -159,6 +160,13 @@ public boolean matches(String tagName) {
         return false;
     }
 
+    public boolean matches(String... tagNames) {
+        String name = getName();
+        for (String string: tagNames)
+            if (name.equalsIgnoreCase(string.trim())) return true;
+        return false;
+    }
+
 
     private String StripContext(String input) {
         if (input == 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
@@ -23,7 +23,7 @@ public ContextTags(Denizen denizen) {
     // Get scriptqueue context!
     @EventHandler
     public void contextTags(ReplaceableTagEvent event) {
-        if (!event.matches("context, c") || event.getScriptEntry() == null) return;
+        if (!event.matches("context", "c") || event.getScriptEntry() == null) return;
 
         String object = event.getType();
 
@@ -62,7 +62,7 @@ public void contextTags(ReplaceableTagEvent event) {
     // Get a saved script entry!
     @EventHandler
     public void savedEntryTags(ReplaceableTagEvent event) {
-        if (!event.matches("entry, e")
+        if (!event.matches("entry", "e")
                 || event.getScriptEntry() == null
                 || !event.hasNameContext()) return;
 

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/DefinitionTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/DefinitionTags.java
@@ -23,7 +23,7 @@ public DefinitionTags(Denizen denizen) {
     @EventHandler
     public void definitionTag(ReplaceableTagEvent event) {
 
-        if (!event.matches("definition, def, d")) return;
+        if (!event.matches("definition", "def", "d")) return;
 
         if (!event.hasNameContext()) {
             dB.echoError("Invalid definition tag, no context specified!");

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/LocationTags.java
@@ -23,7 +23,7 @@ public LocationTags(Denizen denizen) {
     @EventHandler
     public void locationTags(ReplaceableTagEvent event) {
 
-        if (!event.matches("location, l") || event.replaced()) 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/PlayerTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java
@@ -56,7 +56,7 @@ public void run() {
     @EventHandler
     public void playerTags(ReplaceableTagEvent event) {
 
-        if (!event.matches("player, pl") || event.replaced()) return;
+        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());

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ProcedureScriptTag.java b/src/main/java/net/aufdemrand/denizen/tags/core/ProcedureScriptTag.java
@@ -119,7 +119,7 @@ public void procedureTag(ReplaceableTagEvent event) {
         // Returns the 'determine' result of a procedure script.
         // See <@link example Using Procedure Scripts>.
         // -->
-        if (!event.matches("proc, pr")) return;
+        if (!event.matches("proc", "pr")) return;
 
         Attribute attr = event.getAttributes();
         int attribs = 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
@@ -23,7 +23,7 @@ public QueueTags(Denizen denizen) {
     @EventHandler
     public void queueTag(ReplaceableTagEvent event) {
 
-        if (!event.matches("queue, q")) return;
+        if (!event.matches("queue", "q")) return;
 
         Attribute attribute = new Attribute(event.raw_tag, event.getScriptEntry()).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
@@ -23,7 +23,7 @@ public ScriptTags(Denizen denizen) {
     @EventHandler
     public void scriptTags(ReplaceableTagEvent event) {
 
-        if (!event.matches("script, s") || event.replaced()) return;
+        if (!event.matches("script", "s") || event.replaced()) return;
 
         // Stage the location
         dScript script = null;

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java
@@ -54,7 +54,7 @@ public UtilTags(Denizen denizen) {
     // -->
     @EventHandler
     public void mathTag(ReplaceableTagEvent event) {
-        if (!event.matches("math, m")) return;
+        if (!event.matches("math", "m")) return;
         try {
             Double evaluation = new DoubleEvaluator().evaluate(event.getValue());
             event.setReplaced(new Element(String.valueOf(evaluation)).getAttribute(event.getAttributes().fulfill(1)));
@@ -78,7 +78,7 @@ public void mathTag(ReplaceableTagEvent event) {
     // -->
     @EventHandler
     public void ternaryTag(ReplaceableTagEvent event) {
-        if (!event.matches("ternary, tern, t")) return;
+        if (!event.matches("ternary", "tern", "t")) return;
 
         // Fallback if nothing to evaluate
         if (!event.hasNameContext()) return;
@@ -94,7 +94,7 @@ public void ternaryTag(ReplaceableTagEvent event) {
 
     @EventHandler
     public void serverTag(ReplaceableTagEvent event) {
-        if (!event.matches("server, svr, global") || event.replaced()) return;
+        if (!event.matches("server", "svr", "global") || event.replaced()) return;
         Attribute attribute =
                 new Attribute(event.raw_tag, event.getScriptEntry()).fulfill(1);
 
@@ -681,7 +681,7 @@ else if (player.getName().toLowerCase().contains(matchInput) && matchPlayer == n
 
     @EventHandler
     public void utilTag(ReplaceableTagEvent event) {
-        if (!event.matches("util, u")) return;
+        if (!event.matches("util", "u")) return;
 
         String type = event.getType() != null ? event.getType() : "";
         String typeContext = event.getTypeContext() != null ? event.getTypeContext() : "";