Cleaning

DenizenScript · Jul 28, 2015 · d438abd · d438abd
1 parent 58c55fe
commit d438abd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDamagedScriptEvent.java
@@ -175,9 +175,11 @@ else if ((name.equals("damager"))  && (damager != null)) {
         else if ((name.equals("projectile"))  && (projectile != null)) {
             return projectile;
         }
-        for (EntityDamageEvent.DamageModifier dm : EntityDamageEvent.DamageModifier.values()) {
-            if (name.equals("damage_" + dm.name())) {
-                return new Element(event.getDamage(dm));
+        if (name.startsWith("damage_")) {
+            for (EntityDamageEvent.DamageModifier dm : EntityDamageEvent.DamageModifier.values()) {
+                if (name.equals("damage_" + dm.name())) {
+                    return new Element(event.getDamage(dm));
+                }
             }
         }
         return super.getContext(name);

diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java
@@ -127,7 +127,7 @@ public dObject getContext(String name) {
         else if (name.equals("reason")) {
             return reason;
         }
-        else if (name.equals("cuboids")) {
+        else if (name.equals("cuboids")) { // DEPRECATED
             return cuboids;
         }
         else if ((name.equals("target")) && (target != null)) {

diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java
@@ -147,7 +147,7 @@ public dObject getContext(String name) {
         else if (name.equals("material")) {
             return material;
         }
-        else if (name.equals("cuboids")) {
+        else if (name.equals("cuboids")) { // DEPRECATED
             return cuboids;
         }
         else if (name.equals("xp")) {

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java
@@ -63,6 +63,8 @@ public static String doEvents(List<String> events, dNPC npc, dPlayer player, Map
     // @Events
     // server start
     //
+    // @Regex ^server start$
+    //
     // @Triggers when the server starts
     //
     // @Determine
@@ -84,19 +86,22 @@ public void run() {
         String determination = doEvents(Arrays.asList("server start"),
                 null, null, null);
 
-        if (determination.toUpperCase().startsWith("CANCELLED"))
+        if (determination.toUpperCase().startsWith("CANCELLED")) {
             Bukkit.getServer().shutdown(); // TODO: WHY IS THIS AN OPTION?!
+        }
     }
 
     private final Map<String, Integer> current_time = new HashMap<String, Integer>();
 
     // <--[event]
     // @Events
     // time changes (in <world>)
-    // <0-23>:00 in <world>
     // time <0-23> in <world>
     //
+    // @Regex ^time [^\s]+( in [^\s]+)$
+    //
     // @Triggers when the current time changes in a world (once per mine-hour).
+    //
     // @Context
     // <context.time> returns the current time.
     // <context.world> returns the world.
@@ -121,7 +126,7 @@ public void timeEvent() {
                 doEvents(Arrays.asList
                                 ("time changes",
                                         "time changes in " + currentWorld.identifySimple(),
-                                        String.valueOf(hour) + ":00 in " + currentWorld.identifySimple(),
+                                        String.valueOf(hour) + ":00 in " + currentWorld.identifySimple(), // NOTE: Deprecated
                                         "time " + String.valueOf(hour) + " in " + currentWorld.identifySimple()),
                         null, null, context, true);