Converted "world unloads" to ScriptEvent

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

@@ -660,6 +660,7 @@ public void onEnable() {
             ScriptEvent.registerScriptEvent(new VehicleCollidesBlockScriptEvent());
             ScriptEvent.registerScriptEvent(new VehicleCollidesEntityScriptEvent());
             ScriptEvent.registerScriptEvent(new VehicleMoveScriptEvent());
+            ScriptEvent.registerScriptEvent(new WorldUnloadsScriptEvent());
 
 
             ObjectFetcher.registerWithObjectFetcher(dItem.class);      // i@

src/main/java/net/aufdemrand/denizen/events/world/WorldUnloadsScriptEvent.java

@@ -0,0 +1,91 @@
+package net.aufdemrand.denizen.events.world;
+
+
+import net.aufdemrand.denizen.objects.dWorld;
+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.world.WorldUnloadEvent;
+
+import java.util.HashMap;
+
+public class WorldUnloadsScriptEvent extends ScriptEvent implements Listener {
+
+    // <--[event]
+    // @Events
+    // world unloads
+    // <world> unloads
+    //
+    // @Cancellable true
+    //
+    // @Triggers when a world is unloaded.
+    //
+    // @Context
+    // <context.world> returns the dWorld that was unloaded.
+    //
+    // -->
+
+    public WorldUnloadsScriptEvent() {
+        instance = this;
+    }
+
+    public static WorldUnloadsScriptEvent instance;
+    public dWorld world;
+    public WorldUnloadEvent event;
+
+    @Override
+    public boolean couldMatch(ScriptContainer scriptContainer, String s) {
+        return CoreUtilities.getXthArg(1,CoreUtilities.toLowerCase(s)).equals("unloads");
+    }
+
+    @Override
+    public boolean matches(ScriptContainer scriptContainer, String s) {
+        String wCheck = CoreUtilities.getXthArg(0,CoreUtilities.toLowerCase(s));
+        if (!wCheck.equals("world") && !wCheck.equals(CoreUtilities.toLowerCase(world.getName()))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return "WorldUnloads";
+    }
+
+    @Override
+    public void init() {
+        Bukkit.getServer().getPluginManager().registerEvents(this, DenizenAPI.getCurrentInstance());
+    }
+
+    @Override
+    public void destroy() {
+        WorldUnloadEvent.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("world", world);
+        return context;
+    }
+
+    @EventHandler
+    public void onWorldUnloads(WorldUnloadEvent event) {
+        world = new dWorld(event.getWorld());
+        cancelled = event.isCancelled();
+        this.event = event;
+        fire();
+        event.setCancelled(cancelled);
+    }
+}

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

@@ -2290,27 +2290,4 @@ public void worldSave(WorldSaveEvent event) {
                 null, null, context, true);
     }
 
-    // <--[event]
-    // @Events
-    // world unloads
-    // <world> unloads
-    //
-    // @Triggers when a world is unloaded.
-    // @Context
-    // <context.world> returns the dWorld that was unloaded.
-    //
-    // -->
-    @EventHandler
-    public void worldUnload(WorldUnloadEvent event) {
-
-        Map<String, dObject> context = new HashMap<String, dObject>();
-        dWorld world = new dWorld(event.getWorld());
-
-        context.put("world", world);
-
-        doEvents(Arrays.asList
-                        ("world unloads",
-                                world.identifySimple() + " unloads"),
-                null, null, context, true);
-    }
 }