Add PlayerJumpEvent

Spigot-API-Patches/0070-Add-PlayerJumpEvent.patch

@@ -0,0 +1,112 @@
+From d1874a92aadb4b6161c2b49276cd76740cc30919 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Thu, 28 Sep 2017 17:21:32 -0400
+Subject: [PATCH] Add PlayerJumpEvent
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
+new file mode 100644
+index 00000000..1ea9c65f
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java
+@@ -0,0 +1,97 @@
++package com.destroystokyo.paper.event.player;
++
++import com.google.common.base.Preconditions;
++import org.bukkit.Location;
++import org.bukkit.entity.Player;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.player.PlayerEvent;
++
++/**
++ * Holds information for player jump events
++ */
++public class PlayerJumpEvent extends PlayerEvent implements Cancellable {
++    private static final HandlerList handlers = new HandlerList();
++    private boolean cancel = false;
++    private Location from;
++    private Location to;
++
++    public PlayerJumpEvent(final Player player, final Location from, final Location to) {
++        super(player);
++        this.from = from;
++        this.to = to;
++    }
++
++    /**
++     * Gets the cancellation state of this event. A cancelled event will not
++     * be executed in the server, but will still pass to other plugins
++     * <p>
++     * If a jump event is cancelled, the player will be moved or
++     * teleported back to the Location as defined by getFrom(). This will not
++     * fire an event
++     *
++     * @return true if this event is cancelled
++     */
++    public boolean isCancelled() {
++        return cancel;
++    }
++
++    /**
++     * Sets the cancellation state of this event. A cancelled event will not
++     * be executed in the server, but will still pass to other plugins
++     * <p>
++     * If a jump event is cancelled, the player will be moved or
++     * teleported back to the Location as defined by getFrom(). This will not
++     * fire an event
++     *
++     * @param cancel true if you wish to cancel this event
++     */
++    public void setCancelled(boolean cancel) {
++        this.cancel = cancel;
++    }
++
++    /**
++     * Gets the location this player jumped from
++     *
++     * @return Location the player jumped from
++     */
++    public Location getFrom() {
++        return from;
++    }
++
++    /**
++     * Sets the location to mark as where the player jumped from
++     *
++     * @param from New location to mark as the players previous location
++     */
++    public void setFrom(Location from) {
++        validateLocation(from);
++        this.from = from;
++    }
++
++    /**
++     * Gets the location this player jumped to
++     *
++     * This information is based on what the client sends, it typically
++     * has little relation to the arc of the jump at any given point.
++     *
++     * @return Location the player jumped to
++     */
++    public Location getTo() {
++        return to;
++    }
++
++    private void validateLocation(Location loc) {
++        Preconditions.checkArgument(loc != null, "Cannot use null location!");
++        Preconditions.checkArgument(loc.getWorld() != null, "Cannot use null location with null world!");
++    }
++
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}
+-- 
+2.14.1.windows.1
+

Spigot-Server-Patches/0242-Add-PlayerJumpEvent.patch

@@ -0,0 +1,45 @@
+From 00743ab18f54c5f7fdf15706859f2803dbba1a6b Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Thu, 28 Sep 2017 17:21:44 -0400
+Subject: [PATCH] Add PlayerJumpEvent
+
+
+@@ -584,7 +585,34 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+                             d8 = d5 - this.p;
+                             d9 = d6 - this.q;
+                             if (this.player.onGround && !packetplayinflying.a() && d8 > 0.0D) {
+-                                this.player.cu();
++                                // Paper start - Add player jump event
++                                Player player = this.getPlayer();
++                                Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
++                                Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
++
++                                // If the packet contains movement information then we update the To location with the correct XYZ.
++                                if (packetplayinflying.hasPos) {
++                                    to.setX(packetplayinflying.x);
++                                    to.setY(packetplayinflying.y);
++                                    to.setZ(packetplayinflying.z);
++                                }
++
++                                // If the packet contains look information then we update the To location with the correct Yaw & Pitch.
++                                if (packetplayinflying.hasLook) {
++                                    to.setYaw(packetplayinflying.yaw);
++                                    to.setPitch(packetplayinflying.pitch);
++                                }
++
++                                PlayerJumpEvent event = new PlayerJumpEvent(player, from, to);
++
++                                if (event.callEvent()) {
++                                    this.player.cu();
++                                } else {
++                                    from = event.getFrom();
++                                    this.internalTeleport(from.getX(), from.getY(), from.getZ(), from.getYaw(), from.getPitch(), Collections.emptySet());
++                                    return;
++                                }
++                                // Paper end
+                             }
+ 
+                             this.player.move(EnumMoveType.PLAYER, d7, d8, d9);
+-- 
+2.14.1.windows.1
+