From 9c5bf5ed9d44357f1e725eadcfb65ff65e0e1d68 Mon Sep 17 00:00:00 2001 From: Jeremy Schroeder Date: Thu, 4 Jul 2013 12:36:10 -0400 Subject: [PATCH] Minor Cleanup. --- .../net/aufdemrand/denizen/tags/core/PlayerTags.java | 6 ++---- .../denizen/tags/core/ProcedureScriptTag.java | 2 +- .../net/aufdemrand/denizen/tags/core/UtilTags.java | 11 +++++------ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java index 77e3f87a34..a246efbece 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java @@ -21,13 +21,10 @@ public PlayerTags(Denizen denizen) { denizen.getServer().getPluginManager().registerEvents(this, denizen); } - /////////// // Player Chat History ///////// - // TODO: Find a better place for this? - public static Map> playerChatHistory = new ConcurrentHashMap>(8, 0.9f, 2); @EventHandler(priority = EventPriority.MONITOR) @@ -66,7 +63,8 @@ public void playerTags(ReplaceableTagEvent event) { if (dPlayer.matches(attribute.getContext(1))) p = dPlayer.valueOf(attribute.getContext(1)); else { - dB.echoDebug("Could not match '" + attribute.getContext(1) + "' to a valid player!"); + dB.echoDebug("Could not match '" + + attribute.getContext(1) + "' to a valid player!"); return; } diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ProcedureScriptTag.java b/src/main/java/net/aufdemrand/denizen/tags/core/ProcedureScriptTag.java index 215ab60122..9b2b0fcd12 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/ProcedureScriptTag.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/ProcedureScriptTag.java @@ -20,7 +20,7 @@ public ProcedureScriptTag(Denizen denizen) { } @EventHandler - public void utilTags(ReplaceableTagEvent event) { + public void procedureTag(ReplaceableTagEvent event) { if (!event.matches("proc, pr")) return; if (event.getValue() == null) return; 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 9e832e11fb..870c16da4e 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java @@ -29,12 +29,11 @@ public UtilTags(Denizen denizen) { denizen.getServer().getPluginManager().registerEvents(this, denizen); } - @EventHandler public void mathTags(ReplaceableTagEvent event) { - if (!(event.matches("m") || event.matches("math"))) return; - Double evalulation = new DoubleEvaluator().evaluate(event.getValue()); - event.setReplaced(String.valueOf(evalulation)); + if (!event.matches("math, m")) return; + Double evaluation = new DoubleEvaluator().evaluate(event.getValue()); + event.setReplaced(String.valueOf(evaluation)); } @EventHandler @@ -60,8 +59,8 @@ else if (attribute.startsWith("selected_npc")) { @EventHandler - public void utilTags(ReplaceableTagEvent event) { - if (!event.matches("UTIL, U")) return; + public void miscTags(ReplaceableTagEvent event) { + if (!event.matches("util, u")) return; String type = event.getType() != null ? event.getType() : ""; String typeContext = event.getTypeContext() != null ? event.getTypeContext() : "";