Skip to content

Commit

Permalink
Rewrote "on player jumps" event in new ScriptEvent format.
Browse files Browse the repository at this point in the history
  • Loading branch information
Talamar1 committed Jun 11, 2015
1 parent 417af89 commit 4af796c
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 87 deletions.
2 changes: 1 addition & 1 deletion src/main/java/net/aufdemrand/denizen/Denizen.java
Expand Up @@ -574,7 +574,6 @@ public void onEnable() {
OldEventManager.registerSmartEvent(new FlagSmartEvent());
OldEventManager.registerSmartEvent(new NPCNavigationSmartEvent());
OldEventManager.registerSmartEvent(new PlayerEquipsArmorSmartEvent());
OldEventManager.registerSmartEvent(new PlayerJumpSmartEvent());
OldEventManager.registerSmartEvent(new PlayerStepsOnSmartEvent());
OldEventManager.registerSmartEvent(new PlayerWalkSmartEvent());
OldEventManager.registerSmartEvent(new RedstoneSmartEvent());
Expand All @@ -599,6 +598,7 @@ public void onEnable() {
ScriptEvent.registerScriptEvent(new ItemScrollScriptEvent());
ScriptEvent.registerScriptEvent(new LiquidSpreadScriptEvent());
ScriptEvent.registerScriptEvent(new ListPingScriptEvent());
ScriptEvent.registerScriptEvent(new PlayerJumpScriptEvent());
ScriptEvent.registerScriptEvent(new ResourcePackStatusScriptEvent());
ScriptEvent.registerScriptEvent(new VehicleMoveScriptEvent());

Expand Down

This file was deleted.

@@ -0,0 +1,88 @@
package net.aufdemrand.denizen.events.scriptevents;

import net.aufdemrand.denizen.objects.dLocation;
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.player.PlayerMoveEvent;

import java.util.HashMap;

public class PlayerJumpScriptEvent extends ScriptEvent implements Listener {

// <--[event]
// @Events
// player jumps
//
// @Triggers when a player jumps.
//
// @Context
// <context.location> returns the location the player jumped at.
//
// -->

public PlayerJumpScriptEvent() {
instance = this;
}
public static PlayerJumpScriptEvent instance;
public dLocation location;
public PlayerMoveEvent event;

@Override
public boolean couldMatch(ScriptContainer scriptContainer, String s) {
return CoreUtilities.toLowerCase(s).equals("player jumps");

}

@Override
public boolean matches(ScriptContainer scriptContainer, String s) {
return CoreUtilities.toLowerCase(s).equals("player jumps")
// Did player move vertically?
&& (event.getTo().getBlockY() > event.getFrom().getBlockY()
// and also that the player has a high velocity (jump instead of walking up stairs)
&& Math.abs(event.getPlayer().getVelocity().getY()) > 0.1
// and that the player isn't in any form of fast moving vehicle
&& event.getPlayer().getVehicle() == null);
}

@Override
public String getName() {
return "PlayerJumps";
}

@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 HashMap<String, dObject> getContext() {
HashMap<String, dObject> context = super.getContext();
context.put("location", location);
return context;
}

@EventHandler
public void onPlayerJumps(PlayerMoveEvent event) {
location = new dLocation(event.getFrom());
cancelled = event.isCancelled(); // Bukkit is broken, this doesn't work
this.event = event;
fire();
event.setCancelled(cancelled); // Bukkit is broken, this doesn't work
}
}

0 comments on commit 4af796c

Please sign in to comment.