Merge pull request #1248

c2d29a73 PlayerElytraBoostEvent (BillyGalbreath) * pull/1248/head: PlayerElytraBoostEvent Also merged paper config into parent
2018-07-23 20:24:44 -04:00 · 2018-07-23 20:24:44 -04:00 · 4f7a858bd6
commit 4f7a858bd6
parent 3ad50727b9 c2d29a73ac
71 changed files with 437 additions and 342 deletions
--- a/Spigot-API-Patches/0125-PlayerElytraBoostEvent.patch
+++ b/Spigot-API-Patches/0125-PlayerElytraBoostEvent.patch
@ -0,0 +1,95 @@
+From f0c0d6c6182c1c89de1125c0c2f22559724cfaf5 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Sat, 21 Jul 2018 01:59:53 -0500
+Subject: [PATCH] PlayerElytraBoostEvent
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
+new file mode 100644
+index 00000000..cecb2182
+--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
+@@ -0,0 +1,80 @@
+package com.destroystokyo.paper.event.player;
+
+import org.bukkit.entity.Firework;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.inventory.ItemStack;
+
+/**
+ * Fired when a player boosts elytra flight with a firework
+ */
+public class PlayerElytraBoostEvent extends PlayerEvent implements Cancellable {
+    private static final HandlerList handlers = new HandlerList();
+    private boolean cancelled = false;
+    private final ItemStack itemStack;
+    private Firework firework;
+    private boolean consume = true;
+
+    public PlayerElytraBoostEvent(Player player, ItemStack itemStack, Firework firework) {
+        super(player);
+        this.itemStack = itemStack;
+        this.firework = firework;
+    }
+
+    /**
+     * Get the firework itemstack used
+     *
+     * @return ItemStack of firework
+     */
+    public ItemStack getItemStack() {
+        return itemStack;
+    }
+
+    /**
+     * Get the firework entity that was spawned
+     *
+     * @return Firework entity
+     */
+    public Firework getFirework() {
+        return firework;
+    }
+
+    /**
+     * Get whether to consume the firework or not
+     *
+     * @return True to consume
+     */
+    public boolean shouldConsume() {
+        return consume;
+    }
+
+    /**
+     * Set whether to consume the firework or not
+     *
+     * @param consume True to consume
+     */
+    public void setShouldConsume(boolean consume) {
+        this.consume = consume;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        cancelled = cancel;
+    }
+}
+-- 
+2.11.0
+