Rewrote "player walks on" in ScriptEvent format.

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

@@ -674,6 +674,7 @@ public void onEnable() {
             ScriptEvent.registerScriptEvent(new PlayerThrowsEggScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerUsesPortalScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerWalkScriptEvent());
+            ScriptEvent.registerScriptEvent(new PlayerWalksOverScriptEvent());
             ScriptEvent.registerScriptEvent(new PortalCreateScriptEvent());
             ScriptEvent.registerScriptEvent(new ProjectileLaunchedScriptEvent());
             ScriptEvent.registerScriptEvent(new PotionSplashScriptEvent());

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

@@ -0,0 +1,106 @@
+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.objects.dLocation;
+import net.aufdemrand.denizen.objects.notable.NotableManager;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
+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.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerMoveEvent;
+
+import java.util.HashMap;
+
+public class PlayerWalksOverScriptEvent extends BukkitScriptEvent implements Listener {
+
+    // <--[event]
+    // @Events
+    // player walks over notable
+    // player walks over <location>
+    //
+    // @Cancellable true
+    //
+    // @Triggers when a player walks over a notable location.
+    //
+    // @Context
+    // <context.notable> returns an Element of the notable location's name.
+    //
+    // -->
+
+    public PlayerWalksOverScriptEvent() {
+        instance = this;
+    }
+
+    public static PlayerWalksOverScriptEvent instance;
+    public String notable;
+    public PlayerMoveEvent event;
+
+    @Override
+    public boolean couldMatch(ScriptContainer scriptContainer, String s) {
+        return CoreUtilities.toLowerCase(s).startsWith("player walks over");
+    }
+
+    @Override
+    public boolean matches(ScriptContainer scriptContainer, String s) {
+        String lower = CoreUtilities.toLowerCase(s);
+        String loc = CoreUtilities.getXthArg(3, lower);
+        return loc.equals(CoreUtilities.toLowerCase(notable)) || tryLocation(new dLocation(event.getPlayer().getLocation()), loc);
+    }
+
+    @Override
+    public String getName() {
+        return "PlayerWalksOver";
+    }
+
+    @Override
+    public void init() {
+        Bukkit.getServer().getPluginManager().registerEvents(this, DenizenAPI.getCurrentInstance());
+    }
+
+    @Override
+    public void destroy() {
+        PlayerMoveEvent.getHandlerList().unregister(this);
+    }
+
+    @Override
+    public boolean applyDetermination(ScriptContainer container, String determination) {
+        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("notable", new Element(notable));
+        return context;
+    }
+
+    @EventHandler
+    public void onPlayerWalksOver(PlayerMoveEvent event) {
+        if (event.getFrom().getBlock().equals(event.getTo().getBlock())) {
+            return;
+        }
+        if (dEntity.isNPC(event.getPlayer())) {
+            return;
+        }
+        notable = NotableManager.getSavedId(new dLocation(event.getTo().getBlock().getLocation()));
+        if (notable == null) {
+            return;
+        }
+        cancelled = event.isCancelled();
+        this.event = event;
+        fire();
+        event.setCancelled(cancelled);
+    }
+}

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

@@ -988,40 +988,4 @@ public void playerLogin(PlayerLoginEvent event) {
         dPlayer.notePlayer(event.getPlayer());
     }
 
-    // <--[event]
-    // @Events
-    // player walks over notable
-    // player walks over <location>
-    //
-    // @Triggers when a player walks over a notable location.
-    // @Context
-    // <context.notable> returns an Element of the notable location's name.
-    //
-    // @Determine
-    // "CANCELLED" to stop the player from moving to the notable location.
-    //
-    // -->
-    @EventHandler
-    public void playerMove(PlayerMoveEvent event) {
-        if (event.getFrom().getBlock().equals(event.getTo().getBlock())) return;
-
-        String name = NotableManager.getSavedId(new dLocation(event.getTo().getBlock().getLocation()));
-
-        if (name != null) {
-            Map<String, dObject> context = new HashMap<String, dObject>();
-            context.put("notable", new Element(name));
-
-            String determination = doEvents(Arrays.asList
-                            ("player walks over notable",
-                                    "player walks over " + name,
-                                    "walked over notable",
-                                    "walked over " + name),
-                    null, dEntity.getPlayerFrom(event.getPlayer()), context, true);
-
-            if (determination.toUpperCase().startsWith("CANCELLED") ||
-                    determination.toUpperCase().startsWith("FROZEN"))
-                event.setCancelled(true);
-        }
-    }
-
 }