Rewrote "player animates" in ScriptEvent format.

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

@@ -638,6 +638,7 @@ public void onEnable() {
             ScriptEvent.registerScriptEvent(new PigZappedScriptEvent());
             ScriptEvent.registerScriptEvent(new PistonExtendsScriptEvent());
             ScriptEvent.registerScriptEvent(new PistonRetractsScriptEvent());
+            ScriptEvent.registerScriptEvent(new PlayerAnimatesScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerBreaksBlockScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerChangesSignScriptEvent());
             ScriptEvent.registerScriptEvent(new PlayerChangesWorldScriptEvent());

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

@@ -0,0 +1,105 @@
+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.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.PlayerAnimationEvent;
+
+import java.util.HashMap;
+
+public class PlayerAnimatesScriptEvent extends BukkitScriptEvent implements Listener {
+
+    // <--[event]
+    // @Events
+    // player animates (<animation>) (in <area>)
+    //
+    // @Cancellable true
+    //
+    // @Triggers when a player performs an animation.
+    //
+    // @Context
+    // <context.animation> returns the name of the animation.
+    //
+    // -->
+
+    public PlayerAnimatesScriptEvent() {
+        instance = this;
+    }
+
+    public static PlayerAnimatesScriptEvent instance;
+    public String animation;
+    private dLocation location;
+    public PlayerAnimationEvent event;
+
+    @Override
+    public boolean couldMatch(ScriptContainer scriptContainer, String s) {
+        return CoreUtilities.toLowerCase(s).startsWith("player animates");
+    }
+
+    @Override
+    public boolean matches(ScriptContainer scriptContainer, String s) {
+        String lower = CoreUtilities.toLowerCase(s);
+        if (dEntity.isNPC(event.getPlayer())) {
+            return false;
+        }
+
+        String ani = CoreUtilities.getXthArg(2, lower);
+        if (ani.length() > 0 && !ani.equals("in") && !ani.equals(animation)) {
+            return false;
+        }
+
+        return runInCheck(scriptContainer, s, lower, location);
+    }
+
+    @Override
+    public String getName() {
+        return "PlayerAnimates";
+    }
+
+    @Override
+    public void init() {
+        Bukkit.getServer().getPluginManager().registerEvents(this, DenizenAPI.getCurrentInstance());
+    }
+
+    @Override
+    public void destroy() {
+        PlayerAnimationEvent.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("animation", new Element(animation));
+        return context;
+    }
+
+    @EventHandler
+    public void onEntityAnimates(PlayerAnimationEvent event) {
+        location = new dLocation(event.getPlayer().getLocation());
+        animation = event.getAnimationType().name();
+        cancelled = event.isCancelled();
+        this.event = event;
+        fire();
+        event.setCancelled(cancelled);
+    }
+}

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

@@ -707,37 +707,6 @@ public void run() {
 
     }
 
-    // <--[event]
-    // @Events
-    // player animates (<animation>)
-    //
-    // @Triggers when a player performs an animation.
-    // @Context
-    // <context.animation> returns the name of the animation.
-    //
-    // @Determine
-    // "CANCELLED" to stop the player from animating.
-    //
-    // -->
-    @EventHandler
-    public void playerAnimation(PlayerAnimationEvent event) {
-
-        if (dEntity.isNPC(event.getPlayer()))
-            return;
-
-        Map<String, dObject> context = new HashMap<String, dObject>();
-        String animation = event.getAnimationType().name();
-        context.put("animation", new Element(animation));
-
-        String determination = doEvents(Arrays.asList
-                        ("player animates",
-                                "player animates " + animation),
-                null, dEntity.getPlayerFrom(event.getPlayer()), context);
-
-        if (determination.toUpperCase().startsWith("CANCELLED"))
-            event.setCancelled(true);
-    }
-
     // <--[event]
     // @Events
     // player throws (hatching/non-hatching) egg