Rewrote "player joins" in ScriptEvent format.

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

@@ -650,6 +650,7 @@ public void onEnable() {
             ScriptEvent.registerScriptEvent(new PlayerDropsItemScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerEntersBedScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerFishesScriptEvent());
+            ScriptEvent.registerScriptEvent(new PlayerJoinsScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerJumpScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerLeavesBedScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerOpensInvScriptEvent());

src/main/java/net/aufdemrand/denizen/events/player/PlayerJoinsScriptEvent.java

@@ -0,0 +1,111 @@
+package net.aufdemrand.denizen.events.player;
+
+import net.aufdemrand.denizen.BukkitScriptEntryData;
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
+import net.aufdemrand.denizen.objects.dEntity;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
+import net.aufdemrand.denizen.utilities.ScoreboardHelper;
+import net.aufdemrand.denizencore.objects.Element;
+import net.aufdemrand.denizencore.objects.dObject;
+import net.aufdemrand.denizencore.scripts.ScriptEntryData;
+import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.scoreboard.Scoreboard;
+
+import java.util.HashMap;
+
+public class PlayerJoinsScriptEvent extends BukkitScriptEvent implements Listener {
+
+    // <--[event]
+    // @Events
+    // player joins
+    // player join
+    //
+    // @Cancellable false
+    //
+    // @Triggers when a player joins the server.
+    //
+    // @Context
+    // <context.message> returns an Element of the join message.
+    //
+    // @Determine
+    // Element(String) to change the join message.
+    //
+    // -->
+
+    public PlayerJoinsScriptEvent() {
+        instance = this;
+    }
+
+    public static PlayerJoinsScriptEvent instance;
+    public String message;
+    public PlayerJoinEvent event;
+
+    @Override
+    public boolean couldMatch(ScriptContainer scriptContainer, String s) {
+        return CoreUtilities.toLowerCase(s).startsWith("player join");
+    }
+
+    @Override
+    public boolean matches(ScriptContainer scriptContainer, String s) {
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return "PlayerJoins";
+    }
+
+    @Override
+    public void init() {
+        Bukkit.getServer().getPluginManager().registerEvents(this, DenizenAPI.getCurrentInstance());
+    }
+
+    @Override
+    public void destroy() {
+        PlayerJoinEvent.getHandlerList().unregister(this);
+    }
+
+    @Override
+    public boolean applyDetermination(ScriptContainer container, String determination) {
+        if (!CoreUtilities.toLowerCase(determination).equals("none")) {
+            message = determination;
+            return true;
+        }
+        return super.applyDetermination(container, determination);
+    }
+
+    @Override
+    public ScriptEntryData getScriptEntryData() {
+        return new BukkitScriptEntryData(dEntity.isPlayer(event.getPlayer()) ? dEntity.getPlayerFrom(event.getPlayer()) : null, null);
+    }
+
+    @Override
+    public HashMap<String, dObject> getContext() {
+        HashMap<String, dObject> context = super.getContext();
+        context.put("message", new Element(message));
+        return context;
+    }
+
+    @EventHandler
+    public void onPlayerJoins(PlayerJoinEvent event) {
+        if (dEntity.isNPC(event.getPlayer())) {
+            return;
+        }
+        message = event.getJoinMessage();
+        Player player = event.getPlayer();
+        this.event = event;
+        fire();
+        event.setJoinMessage(message);
+        if (ScoreboardHelper.viewerMap.containsKey(player.getName())) {
+            Scoreboard score = ScoreboardHelper.getScoreboard(ScoreboardHelper.viewerMap.get(player.getName()));
+            if (score != null)
+                player.setScoreboard(score);
+        }
+    }
+}

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

@@ -977,48 +977,6 @@ public void playerInteractEntity(PlayerInteractEntityEvent event) {
             event.setCancelled(true);
     }
 
-    // <--[event]
-    // @Events
-    // player joins
-    // player join
-    //
-    // @Triggers when a player joins the server.
-    // @Context
-    // <context.message> returns an Element of the join message.
-    //
-    // @Determine
-    // Element(String) to change the join message.
-    //
-    // -->
-    @EventHandler
-    public void playerJoinEvent(PlayerJoinEvent event) {
-
-        if (dEntity.isNPC(event.getPlayer()))
-            return;
-
-        Player player = event.getPlayer();
-        Map<String, dObject> context = new HashMap<String, dObject>();
-        context.put("message", new Element(event.getJoinMessage()));
-
-        String determination = doEvents(Arrays.asList
-                        ("player joins",
-                                "player join"),
-                null, dEntity.getPlayerFrom(player), context);
-
-        // Handle message
-        if (!determination.equals("none")) {
-            event.setJoinMessage(determination);
-        }
-
-        // As a tie-in with ScoreboardHelper, make this player view
-        // the scoreboard he/she is supposed to view
-        if (ScoreboardHelper.viewerMap.containsKey(player.getName())) {
-            Scoreboard score = ScoreboardHelper.getScoreboard(ScoreboardHelper.viewerMap.get(player.getName()));
-            if (score != null)
-                player.setScoreboard(score);
-        }
-    }
-
     // <--[event]
     // @Events
     // player kicked