patch up event regexes

Need to make more regexes
DenizenScript · Jul 25, 2015 · c673d08 · c673d08
1 parent 4da7614
commit c673d08
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/core/CommandSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/CommandSmartEvent.java
@@ -162,7 +162,7 @@ private List<String> getAll(String cmd) {
     // command
     // <command_name>|... command (in <area>)
     //
-    // @Regex on [^\s]+ command(in \w+)?
+    // @Regex ^on( [^\s]+)? command( in ((notable (cuboid|ellipsoid))|([^\s]+)))?$
     //
     // @Triggers when a player or console runs a Bukkit command. This happens before
     // any code of established commands allowing scripters to 'override' existing commands.

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/CuboidEnterExitSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/CuboidEnterExitSmartEvent.java
@@ -98,7 +98,7 @@ public void breakDown() {
     // player enters notable cuboid
     // player exits notable cuboid
     //
-    // @Regex on player (?:enters|exits) (notable cuboid|(cu@)?\w+)
+    // @Regex on player (enters|exits) (notable cuboid|[^\s]+)
     //
     // @Triggers when a player enters or exits a notable cuboid.
     // @Context

diff --git a/src/main/java/net/aufdemrand/denizen/events/core/PlayerEquipsArmorSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/PlayerEquipsArmorSmartEvent.java
@@ -335,7 +335,7 @@ private boolean isInteractive(Material material) {
     // player (un)equips <item>
     // player (un)equips [helmet/chestplate/leggings/boots]
     //
-    // @Regex on player (un)equips (m@|i@)?\w+
+    // @Regex ^on player (un)?equips [^\s]+$
     //
     // @Triggers when a player (un)equips armor.
     // @Context