mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
2f782a6652
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
100 lines
2.6 KiB
Diff
100 lines
2.6 KiB
Diff
From 86c181f87ca0644622e3ee055e7ed5a1ba8ad4d7 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 000000000..e9a76a25f
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
|
|
@@ -0,0 +1,85 @@
|
|
+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;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * 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;
|
|
+ @NotNull private final ItemStack itemStack;
|
|
+ @NotNull private Firework firework;
|
|
+ private boolean consume = true;
|
|
+
|
|
+ public PlayerElytraBoostEvent(@NotNull Player player, @NotNull ItemStack itemStack, @NotNull Firework firework) {
|
|
+ super(player);
|
|
+ this.itemStack = itemStack;
|
|
+ this.firework = firework;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the firework itemstack used
|
|
+ *
|
|
+ * @return ItemStack of firework
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemStack getItemStack() {
|
|
+ return itemStack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the firework entity that was spawned
|
|
+ *
|
|
+ * @return Firework entity
|
|
+ */
|
|
+ @NotNull
|
|
+ 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;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+}
|
|
--
|
|
2.21.0
|
|
|