Rewrote "on leaves decay" event in new ScriptEvent format.

Removed from BukkitWorldScriptHelper.

src/main/java/net/aufdemrand/denizen/Denizen.java

@@ -606,6 +606,7 @@ public void onEnable() {
             ScriptEvent.registerScriptEvent(new FurnaceSmeltsItemScriptEvent());
             ScriptEvent.registerScriptEvent(new ItemMoveScriptEvent());
             ScriptEvent.registerScriptEvent(new ItemScrollScriptEvent());
+            ScriptEvent.registerScriptEvent(new LeafDecaysScriptEvent());
             ScriptEvent.registerScriptEvent(new LiquidSpreadScriptEvent());
             ScriptEvent.registerScriptEvent(new ListPingScriptEvent());
             ScriptEvent.registerScriptEvent(new PistonExtendsScriptEvent());

src/main/java/net/aufdemrand/denizen/events/scriptevents/LeafDecaysScriptEvent.java

@@ -0,0 +1,95 @@
+package net.aufdemrand.denizen.events.scriptevents;
+
+import net.aufdemrand.denizen.objects.dLocation;
+import net.aufdemrand.denizen.objects.dMaterial;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
+import net.aufdemrand.denizencore.events.ScriptEvent;
+import net.aufdemrand.denizencore.objects.dObject;
+import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.LeavesDecayEvent;
+
+import java.util.HashMap;
+
+public class LeafDecaysScriptEvent extends ScriptEvent implements Listener {
+
+    // <--[event]
+    // @Events
+    // leaves decay
+    // <block> decay
+    //
+    // @Cancellable true
+    //
+    // @Triggers when leaves decay.
+    //
+    // @Context
+    // <context.location> returns the dLocation of the leaves.
+    // <context.material> returns the dMaterial of the leaves.
+    //
+    // -->
+
+    public LeafDecaysScriptEvent() {
+        instance = this;
+    }
+    public static LeafDecaysScriptEvent instance;
+    public dLocation location;
+    public dMaterial material;
+    public LeavesDecayEvent event;
+
+    @Override
+    public boolean couldMatch(ScriptContainer scriptContainer, String s) {
+        String lower = CoreUtilities.toLowerCase(s);
+        String mat = CoreUtilities.getXthArg(0, lower);
+        return lower.contains("leaves decay")
+                || (lower.equals(mat + " decay") && dMaterial.matches(mat));
+    }
+
+    @Override
+    public boolean matches(ScriptContainer scriptContainer, String s) {
+        String lower = CoreUtilities.toLowerCase(s);
+        String mat = CoreUtilities.getXthArg(0, lower);
+        return mat.equals("leaves")
+                || (material.identifySimpleNoIdentifier().toLowerCase().equals(mat));
+    }
+
+    @Override
+    public String getName() {
+        return "LeafDecays";
+    }
+
+    @Override
+    public void init() {
+        Bukkit.getServer().getPluginManager().registerEvents(this, DenizenAPI.getCurrentInstance());
+    }
+
+    @Override
+    public void destroy() {
+        LeavesDecayEvent.getHandlerList().unregister(this);
+    }
+
+    @Override
+    public boolean applyDetermination(ScriptContainer container, String determination) {
+        return super.applyDetermination(container, determination);
+    }
+
+    @Override
+    public HashMap<String, dObject> getContext() {
+        HashMap<String, dObject> context = super.getContext();
+        context.put("location", location);
+        context.put("material", material);
+        return context;
+    }
+
+    @EventHandler
+    public void onLeafDecays(LeavesDecayEvent event) {
+        location = new dLocation(event.getBlock().getLocation());
+        material = dMaterial.getMaterialFrom(event.getBlock().getType(), event.getBlock().getData());
+        cancelled = event.isCancelled();
+        this.event = event;
+        fire();
+        event.setCancelled(cancelled);
+    }
+}

src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java

@@ -68,38 +68,6 @@ public static String doEvents(List<String> events, dNPC npc, dPlayer player, Map
     //   BLOCK EVENTS
     /////////////////
 
-    // <--[event]
-    // @Events
-    // leaves decay
-    // <block> decay
-    //
-    // @Triggers when leaves decay.
-    // @Context
-    // <context.location> returns the dLocation of the leaves.
-    // <context.material> returns the dMaterial of the leaves.
-    //
-    // @Determine
-    // "CANCELLED" to stop the leaves from decaying.
-    //
-    // -->
-    @EventHandler
-    public void leavesDecay(LeavesDecayEvent event) {
-
-        Map<String, dObject> context = new HashMap<String, dObject>();
-        dMaterial material = dMaterial.getMaterialFrom(event.getBlock().getType(), event.getBlock().getData());
-
-        context.put("location", new dLocation(event.getBlock().getLocation()));
-        context.put("material", material);
-
-        String determination = doEvents(Arrays.asList
-                ("leaves decay",
-                        material.identifySimple() + " decay"),
-                null, null, context, true);
-
-        if (determination.toUpperCase().startsWith("CANCELLED"))
-            event.setCancelled(true);
-    }
-
     // <--[event]
     // @Events
     // player changes sign